From 7d2d8c582bd6bbd6e3bbc5b6c77736dc94c7fb7f Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 20 Apr 1997 06:41:26 +0000 Subject: Fix up the "hlt vector" change I made. Reviewed by: bde, bde, bde --- sys/amd64/amd64/cpu_switch.S | 14 +++++++------- sys/amd64/amd64/swtch.s | 14 +++++++------- sys/i386/i386/swtch.s | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 30a5e48..3898a53 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: swtch.s,v 1.44 1997/04/07 07:15:54 peter Exp $ + * $Id: swtch.s,v 1.45 1997/04/14 18:12:05 phk Exp $ */ #include "npx.h" @@ -66,6 +66,9 @@ _curpcb: .long 0 /* pointer to curproc's PCB area */ _whichqs: .long 0 /* which run queues have data */ _whichrtqs: .long 0 /* which realtime run queues have data */ _whichidqs: .long 0 /* which idletime run queues have data */ + .globl _hlt_vector +_hlt_vector: .long _default_halt /* pointer to halt routine */ + .globl _qs,_cnt,_panic @@ -275,15 +278,12 @@ idle_loop: call *_hlt_vector /* wait for interrupt */ jmp idle_loop -defaulthlt: +CROSSJUMPTARGET(_idle) + +ENTRY(default_halt) hlt ret - .globl _hlt_vector -_hlt_vector: .long defaulthlt - -CROSSJUMPTARGET(_idle) - /* * cpu_switch() */ diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s index 30a5e48..3898a53 100644 --- a/sys/amd64/amd64/swtch.s +++ b/sys/amd64/amd64/swtch.s @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: swtch.s,v 1.44 1997/04/07 07:15:54 peter Exp $ + * $Id: swtch.s,v 1.45 1997/04/14 18:12:05 phk Exp $ */ #include "npx.h" @@ -66,6 +66,9 @@ _curpcb: .long 0 /* pointer to curproc's PCB area */ _whichqs: .long 0 /* which run queues have data */ _whichrtqs: .long 0 /* which realtime run queues have data */ _whichidqs: .long 0 /* which idletime run queues have data */ + .globl _hlt_vector +_hlt_vector: .long _default_halt /* pointer to halt routine */ + .globl _qs,_cnt,_panic @@ -275,15 +278,12 @@ idle_loop: call *_hlt_vector /* wait for interrupt */ jmp idle_loop -defaulthlt: +CROSSJUMPTARGET(_idle) + +ENTRY(default_halt) hlt ret - .globl _hlt_vector -_hlt_vector: .long defaulthlt - -CROSSJUMPTARGET(_idle) - /* * cpu_switch() */ diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s index 30a5e48..3898a53 100644 --- a/sys/i386/i386/swtch.s +++ b/sys/i386/i386/swtch.s @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: swtch.s,v 1.44 1997/04/07 07:15:54 peter Exp $ + * $Id: swtch.s,v 1.45 1997/04/14 18:12:05 phk Exp $ */ #include "npx.h" @@ -66,6 +66,9 @@ _curpcb: .long 0 /* pointer to curproc's PCB area */ _whichqs: .long 0 /* which run queues have data */ _whichrtqs: .long 0 /* which realtime run queues have data */ _whichidqs: .long 0 /* which idletime run queues have data */ + .globl _hlt_vector +_hlt_vector: .long _default_halt /* pointer to halt routine */ + .globl _qs,_cnt,_panic @@ -275,15 +278,12 @@ idle_loop: call *_hlt_vector /* wait for interrupt */ jmp idle_loop -defaulthlt: +CROSSJUMPTARGET(_idle) + +ENTRY(default_halt) hlt ret - .globl _hlt_vector -_hlt_vector: .long defaulthlt - -CROSSJUMPTARGET(_idle) - /* * cpu_switch() */ -- cgit v1.1