From c3bd7791127be4f4c1d950d0a01bbbd9e1ffde2d Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Mon, 23 Jul 2007 11:23:11 +0000 Subject: [PATCH] Reinstated _IRQTEXT, now with corrected segment loads in irqstack.asm. It is better to use groups than segments here. git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1343 6ac86273-5f31-0410-b378-82cca8765d1b --- kernel/irqstack.asm | 8 ++++---- kernel/segs.inc | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/irqstack.asm b/kernel/irqstack.asm index 3105491..c9f67ce 100644 --- a/kernel/irqstack.asm +++ b/kernel/irqstack.asm @@ -32,7 +32,7 @@ %include "segs.inc" -segment _LOWTEXT +segment _IRQTEXT old_vectors times 16 dd 0 stack_size dw 0 @@ -172,7 +172,7 @@ _init_stacks: push si - mov ax,_LOWTEXT + mov ax,LGROUP mov ds,ax mov bx, [bp+4] @@ -191,7 +191,7 @@ _init_stacks: xor ax, ax mov ds, ax - mov ax, _LOWTEXT + mov ax, LGROUP mov es, ax mov di, old_vectors @@ -225,7 +225,7 @@ set_vect: set_next: mov ax, dx cli stosw - mov ax, _LOWTEXT + mov ax, LGROUP stosw sti add dx, irq_1 - irq_0 diff --git a/kernel/segs.inc b/kernel/segs.inc index ba6e123..a08ce71 100644 --- a/kernel/segs.inc +++ b/kernel/segs.inc @@ -39,7 +39,7 @@ CPU XCPU %endif group PGROUP PSP -group LGROUP _LOWTEXT _IO_TEXT _IO_FIXED_DATA _TEXT +group LGROUP _IRQTEXT _LOWTEXT _IO_TEXT _IO_FIXED_DATA _TEXT group DGROUP _FIXED_DATA _BSS _DATA _DATAEND CONST CONST2 DCONST DYN_DATA %ifdef WATCOM group TGROUP HMA_TEXT_START HMA_TEXT HMA_TEXT_END INIT_TEXT_START INIT_TEXT INIT_TEXT_END @@ -51,6 +51,7 @@ group I_GROUP ID_B ID ID_E IC IDATA IB_B IB IB_E %endif segment PSP class=PSP +segment _IRQTEXT class=LCODE segment _LOWTEXT class=LCODE segment _IO_TEXT class=LCODE segment _IO_FIXED_DATA class=LCODE align=2