* combine the INIT class with the CODE class (classes can span

multiple physical segments)
    * re-add _TEXT to LGROUP to be able to simplify the patchobj magic
    * don't specify -zPI_GROUP for the init code in Borland compilers
      (unnecessary, it will be put there because of segs.inc)
    * remove STDPATCH; it is no longer necessary


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@588 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2003-06-15 12:56:57 +00:00
parent 03e234af3c
commit aa352cc548
10 changed files with 15 additions and 17 deletions

View File

@ -30,9 +30,9 @@
; Code for stack switching during hardware interrupts.
group LGROUP _LOWTEXT
%include "segs.inc"
segment _LOWTEXT class=LCODE
segment _LOWTEXT
old_vectors times 16 dd 0
stack_size dw 0
@ -155,7 +155,7 @@ dont_switch: pushf
iret
segment INIT_TEXT class=INIT
segment INIT_TEXT
global _init_stacks
; VOID init_stacks(VOID FAR *stack_base, COUNT nStacks, WORD stackSize);

View File

@ -27,7 +27,6 @@ HDR=../hdr/
.c.obj :
$(CC) $(CFLAGS) $<
$(STDPATCH) $*.obj
# *List Macros*

View File

@ -28,15 +28,16 @@
;
group PGROUP PSP
group LGROUP _LOWTEXT _IO_TEXT _IO_FIXED_DATA
group LGROUP _LOWTEXT _IO_TEXT _IO_FIXED_DATA _TEXT
group DGROUP _FIXED_DATA _BSS _DATA _DATAEND CONST CONST2 DCONST DYN_DATA
group I_GROUP INIT_TEXT_START INIT_TEXT INIT_TEXT_END ID_B ID ID_E IC IDATA ICONST ICONST2 I_DATA IB_B I_BSS IB IB_E
group TGROUP HMA_TEXT_START HMA_TEXT HMA_TEXT_END
group I_GROUP INIT_TEXT_START INIT_TEXT INIT_TEXT_END ID_B ID ID_E IC IDATA ICONST ICONST2 I_DATA IB_B I_BSS IB IB_E
segment PSP class=PSP
segment _LOWTEXT class=LCODE
segment _IO_TEXT class=LCODE
segment _IO_FIXED_DATA class=LCODE align=2
segment _TEXT class=LCODE
segment _FIXED_DATA class=FDATA align=16
segment _BSS class=BSS align=2
segment _DATA class=DATA align=2
@ -50,9 +51,9 @@ segment DYN_DATA class=DYN_DATA
segment HMA_TEXT_START class=CODE align=16
segment HMA_TEXT class=CODE
segment HMA_TEXT_END class=CODE
segment INIT_TEXT_START class=INIT align=16
segment INIT_TEXT class=INIT
segment INIT_TEXT_END class=INIT
segment INIT_TEXT_START class=CODE align=16
segment INIT_TEXT class=CODE
segment INIT_TEXT_END class=CODE
segment ID_B class=ID align=2
segment ID class=ID align=2
segment ID_E class=ID align=2

View File

@ -49,5 +49,5 @@ MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +F_LXMUL
# ALLCFLAGS specified by turbo.cfg and config.mak
#
ALLCFLAGS=$(TARGETOPT) -zCHMA_TEXT $(ALLCFLAGS)
INITCFLAGS=$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPI_GROUP -zBIB -zGI_GROUP -zSI_GROUP
INITCFLAGS=$(ALLCFLAGS) -zCINIT_TEXT -zDIB -zRID -zTID -zBIB -zGI_GROUP -zSI_GROUP
CFLAGS=$(ALLCFLAGS)

View File

@ -27,7 +27,6 @@ NASMFLAGS = $(NASMFLAGS) -i../hdr/
LINK=$(XLINK)
STDPATCH=@rem
INITPATCH=@rem
!include "..\mkfiles\$(COMPILER).mak"

View File

@ -44,5 +44,4 @@ ALLCFLAGS=-I..\hdr $(TARGETOPT) $(ALLCFLAGS) -nologo -Zl -Fc -WX -Gr -f- -Os -Gs
INITCFLAGS=$(ALLCFLAGS) -NTINIT_TEXT -AT
CFLAGS=$(ALLCFLAGS)
INITPATCH = ..\utils\patchobj CODE=INIT _DATA=IDATA DATA=ID BSS=ID DGROUP=I_GROUP CONST=IC
STDPATCH = ..\utils\patchobj CONST=DCONST
INITPATCH = ..\utils\patchobj _DATA=IDATA DATA=ID BSS=ID DGROUP=I_GROUP CONST=IC

View File

@ -49,5 +49,5 @@ MATH_INSERT=+LDIV +LXMUL +LURSH +LLSH +LRSH
# ALLCFLAGS specified by turbo.cfg and config.mak
#
ALLCFLAGS=$(TARGETOPT) -zCHMA_TEXT $(ALLCFLAGS)
INITCFLAGS=$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPI_GROUP -zBIB -zGI_GROUP -zSI_GROUP
INITCFLAGS=$(ALLCFLAGS) -zCINIT_TEXT -zDIB -zRID -zTID -zBIB -zGI_GROUP -zSI_GROUP
CFLAGS=$(ALLCFLAGS)

View File

@ -49,5 +49,5 @@ MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +F_LXMUL
# ALLCFLAGS specified by turbo.cfg and config.mak
#
ALLCFLAGS=$(TARGETOPT) -zCHMA_TEXT $(ALLCFLAGS)
INITCFLAGS=$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPI_GROUP -zBIB -zGI_GROUP -zSI_GROUP
INITCFLAGS=$(ALLCFLAGS) -zCINIT_TEXT -zDIB -zRID -zTID -zBIB -zGI_GROUP -zSI_GROUP
CFLAGS=$(ALLCFLAGS)

View File

@ -49,5 +49,5 @@ MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +F_LXMUL
# ALLCFLAGS specified by turbo.cfg and config.mak
#
ALLCFLAGS=$(TARGETOPT) -zCHMA_TEXT $(ALLCFLAGS)
INITCFLAGS=$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPI_GROUP -zBIB -zGI_GROUP -zSI_GROUP
INITCFLAGS=$(ALLCFLAGS) -zCINIT_TEXT -zDIB -zRID -zTID -zBIB -zGI_GROUP -zSI_GROUP
CFLAGS=$(ALLCFLAGS)

View File

@ -62,7 +62,7 @@ MATH_INSERT=+i4m
#
ALLCFLAGS=-I..\hdr $(TARGETOPT) $(ALLCFLAGS)-zq-os-s-e5-j-zl-zp1-wx-we-zgf-zff
INITCFLAGS=$(ALLCFLAGS)-ntINIT_TEXT-ncINIT-ndI-gI_GROUP
INITCFLAGS=$(ALLCFLAGS)-ntINIT_TEXT-ndI
CFLAGS=$(ALLCFLAGS)-ntHMA_TEXT
INITPATCH=..\utils\patchobj __U4D=_IU4D __U4M=_IU4M