diff options
| author | bde <bde@FreeBSD.org> | 1996-03-27 17:16:29 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-03-27 17:16:29 +0000 |
| commit | c5add27b03300d6cd5214118abe702fbb1af6bfb (patch) | |
| tree | 6e934e933d6a2cfdc925d7bfce53e4f1f14cb83c /sys/amd64 | |
| parent | 5af00daee73d2049b1628494d8639e9e97aac1ed (diff) | |
| download | FreeBSD-src-c5add27b03300d6cd5214118abe702fbb1af6bfb.zip FreeBSD-src-c5add27b03300d6cd5214118abe702fbb1af6bfb.tar.gz | |
Removed vestiges of dummy frame at top of tmpstk.
Use alignment macros where appropriate.
Cleaned up #includes.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/locore.S | 30 | ||||
| -rw-r--r-- | sys/amd64/amd64/locore.s | 30 |
2 files changed, 32 insertions, 28 deletions
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index e578692..0a72b71 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 "apm.h" #include "opt_ddb.h" -#include "assym.s" /* system definitions */ -#include <machine/psl.h> /* processor status longword defs */ -#include <machine/pte.h> /* page table entry definitions */ -#include <sys/errno.h> /* error return codes */ -#include <machine/specialreg.h> /* x86 special registers */ -#include <machine/cputypes.h> /* x86 cpu type definitions */ -#include <sys/syscall.h> /* system call numbers */ -#include <machine/asmacros.h> /* miscellaneous asm macros */ + +#include <sys/errno.h> +#include <sys/syscall.h> #include <sys/reboot.h> -#include "apm.h" + +#include <machine/asmacros.h> +#include <machine/cputypes.h> +#include <machine/psl.h> +#include <machine/pte.h> +#include <machine/specialreg.h> + +#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 e578692..0a72b71 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 "apm.h" #include "opt_ddb.h" -#include "assym.s" /* system definitions */ -#include <machine/psl.h> /* processor status longword defs */ -#include <machine/pte.h> /* page table entry definitions */ -#include <sys/errno.h> /* error return codes */ -#include <machine/specialreg.h> /* x86 special registers */ -#include <machine/cputypes.h> /* x86 cpu type definitions */ -#include <sys/syscall.h> /* system call numbers */ -#include <machine/asmacros.h> /* miscellaneous asm macros */ + +#include <sys/errno.h> +#include <sys/syscall.h> #include <sys/reboot.h> -#include "apm.h" + +#include <machine/asmacros.h> +#include <machine/cputypes.h> +#include <machine/psl.h> +#include <machine/pte.h> +#include <machine/specialreg.h> + +#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 |
