Date: Sat, 21 Sep 2002 02:30:16 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17846 for review Message-ID: <200209210930.g8L9UGla011602@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17846 Change 17846 by peter@peter_overcee on 2002/09/21 02:30:07 having user code in the middle of locore always bothered me. move sigtrap stuff to a seperate file where we can assemble it with different options if needed. Especially keep it away from the 32/64 bit transition areas. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#12 edit .. //depot/projects/hammer/sys/x86_64/x86_64/sigtramp.s#1 add Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#12 (text+ko) ==== @@ -43,13 +43,6 @@ * and many others. */ -#include "opt_bootp.h" -#include "opt_compat.h" -#include "opt_nfsroot.h" - -#include <sys/syscall.h> -#include <sys/reboot.h> - #include <machine/asmacros.h> #include <machine/cputypes.h> #include <machine/psl.h> @@ -185,10 +178,8 @@ /* Tell the bios to warmboot next time */ movw $0x1234,0x472 -/* Get onto a stack that we can trust. */ +/* Get onto a stack that we can trust and set up a real frame. */ movl $R(HIDENAME(tmpstk)),%esp - -/* Set up a real frame */ pushl %ebp movl %esp, %ebp @@ -205,9 +196,7 @@ mov %ax, %gs call recover_metadata - call identify_cpu - call create_pagetables /* Now enable paging */ @@ -250,31 +239,6 @@ /********************************************************************** * - * Signal trampoline, copied to top of user stack - * - */ -NON_GPROF_ENTRY(sigcode) - call *SIGF_HANDLER(%esp) /* call signal handler */ - lea SIGF_UC(%esp),%eax /* get ucontext_t */ - pushl %eax - movl UC_GS(%eax),%gs /* restore %gs */ - movl $SYS_sigreturn,%eax - pushl %eax /* junk to fake return addr. */ - int $0x80 /* enter kernel with args */ -0: hlt /* priviliged instruction */ - jmp 0b - - ALIGN_TEXT -esigcode: - - .data - .globl szsigcode -szsigcode: - .long esigcode-sigcode - .text - -/********************************************************************** - * * Recover the metadata passed to us from the boot program * */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209210930.g8L9UGla011602>