From 6d72aad8a7a8595ef8e1a92b3380fe1366d2fddd Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Wed, 27 Mar 1996 17:16:29 +0000 Subject: [PATCH] Removed vestiges of dummy frame at top of tmpstk. Use alignment macros where appropriate. Cleaned up #includes. --- sys/amd64/amd64/locore.S | 32 +++++++++++++++++--------------- sys/amd64/amd64/locore.s | 32 +++++++++++++++++--------------- sys/i386/i386/locore.s | 32 +++++++++++++++++--------------- 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index e578692bd40..0a72b71b252 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.62 1996/02/04 21:20:32 davidg Exp $ + * $Id: locore.s,v 1.63 1996/03/02 19:37:38 peter Exp $ */ /* @@ -45,17 +45,20 @@ * Bruce Evans, Wolfgang Solfrank, and many others. */ -#include "opt_ddb.h" -#include "assym.s" /* system definitions */ -#include /* processor status longword defs */ -#include /* page table entry definitions */ -#include /* error return codes */ -#include /* x86 special registers */ -#include /* x86 cpu type definitions */ -#include /* system call numbers */ -#include /* miscellaneous asm macros */ -#include #include "apm.h" +#include "opt_ddb.h" + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "assym.s" /* * XXX @@ -101,12 +104,11 @@ * Globals */ .data - .align 2 /* Just to be sure */ + ALIGN_DATA /* just to be sure */ .globl tmpstk .space 0x2000 /* space for tmpstk - temporary stack */ tmpstk: - .long 0x11111111, 0x22222222, 0x33333333, 0x44444444, 0x55555555 .globl _boothowto,_bootdev @@ -797,10 +799,10 @@ NON_GPROF_ENTRY(sigcode) movl $SYS_sigreturn,%eax /* sigreturn() */ LCALL(0x7,0) /* enter kernel with args on stack */ hlt /* never gets here */ - .align 2 /* long word align */ + .align 2,0x90 /* long word text-align */ _esigcode: + .data .globl _szsigcode _szsigcode: .long _esigcode-_sigcode - .text diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index e578692bd40..0a72b71b252 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.62 1996/02/04 21:20:32 davidg Exp $ + * $Id: locore.s,v 1.63 1996/03/02 19:37:38 peter Exp $ */ /* @@ -45,17 +45,20 @@ * Bruce Evans, Wolfgang Solfrank, and many others. */ -#include "opt_ddb.h" -#include "assym.s" /* system definitions */ -#include /* processor status longword defs */ -#include /* page table entry definitions */ -#include /* error return codes */ -#include /* x86 special registers */ -#include /* x86 cpu type definitions */ -#include /* system call numbers */ -#include /* miscellaneous asm macros */ -#include #include "apm.h" +#include "opt_ddb.h" + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "assym.s" /* * XXX @@ -101,12 +104,11 @@ * Globals */ .data - .align 2 /* Just to be sure */ + ALIGN_DATA /* just to be sure */ .globl tmpstk .space 0x2000 /* space for tmpstk - temporary stack */ tmpstk: - .long 0x11111111, 0x22222222, 0x33333333, 0x44444444, 0x55555555 .globl _boothowto,_bootdev @@ -797,10 +799,10 @@ NON_GPROF_ENTRY(sigcode) movl $SYS_sigreturn,%eax /* sigreturn() */ LCALL(0x7,0) /* enter kernel with args on stack */ hlt /* never gets here */ - .align 2 /* long word align */ + .align 2,0x90 /* long word text-align */ _esigcode: + .data .globl _szsigcode _szsigcode: .long _esigcode-_sigcode - .text diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index e578692bd40..0a72b71b252 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.62 1996/02/04 21:20:32 davidg Exp $ + * $Id: locore.s,v 1.63 1996/03/02 19:37:38 peter Exp $ */ /* @@ -45,17 +45,20 @@ * Bruce Evans, Wolfgang Solfrank, and many others. */ -#include "opt_ddb.h" -#include "assym.s" /* system definitions */ -#include /* processor status longword defs */ -#include /* page table entry definitions */ -#include /* error return codes */ -#include /* x86 special registers */ -#include /* x86 cpu type definitions */ -#include /* system call numbers */ -#include /* miscellaneous asm macros */ -#include #include "apm.h" +#include "opt_ddb.h" + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "assym.s" /* * XXX @@ -101,12 +104,11 @@ * Globals */ .data - .align 2 /* Just to be sure */ + ALIGN_DATA /* just to be sure */ .globl tmpstk .space 0x2000 /* space for tmpstk - temporary stack */ tmpstk: - .long 0x11111111, 0x22222222, 0x33333333, 0x44444444, 0x55555555 .globl _boothowto,_bootdev @@ -797,10 +799,10 @@ NON_GPROF_ENTRY(sigcode) movl $SYS_sigreturn,%eax /* sigreturn() */ LCALL(0x7,0) /* enter kernel with args on stack */ hlt /* never gets here */ - .align 2 /* long word align */ + .align 2,0x90 /* long word text-align */ _esigcode: + .data .globl _szsigcode _szsigcode: .long _esigcode-_sigcode - .text