hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated icc.mak

Browse Source 
fixed a wrong function name in #pragma interrupt in std.c
This commit is contained in:
hyunghwan.chung 2018-12-01 05:22:53 +00:00
parent d79d84ee66
commit 800429d4db
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
moo/lib/icc.mak
View File

@ -6,10 +6,11 @@
# /zfloatsync - FPU is operand-synchronized with the CPU # /zfloatsync - FPU is operand-synchronized with the CPU
# /m create map file # /m create map file
# /g produce debug info # /g produce debug info
CFLAGS := /D__DOS__ /DMOO_ENABLE_STATIC_MODULE /DNDEBUG ###CFLAGS := /D__DOS__ /DMOO_ENABLE_STATIC_MODULE /DNDEBUG
CFLAGS := /D__DOS__ /DMOO_ENABLE_STATIC_MODULE /DMOO_BUILD_DEBUG
LDFLAGS := /xnovm /xregion=12m LDFLAGS := /xnovm /xregion=12m
SRCS := \ LIBSRCS := \
bigint.c \ bigint.c \
comp.c \ comp.c \
debug.c \ debug.c \
@ -22,29 +23,53 @@ SRCS := \
logfmt.c \ logfmt.c \
moo.c \ moo.c \
obj.c \ obj.c \
opt.c \
pf.c \ pf.c \
rbt.c \ rbt.c \
std.c \ std.c \
sym.c \ sym.c \
utf16.c \ utf16.c \
utf8.c \ utf8.c \
utl.c \ utl.c
main.c \
OBJS := $(SRCS:.c=.obj) EXESRCS := \
opt.c \
main.c
LIBOBJS := $(LIBSRCS:.c=.obj)
EXEOBJS := $(EXESRCS:.c=.obj)
LIBFILE=moo.lib
EXEFILE=moo.exe EXEFILE=moo.exe
MODFILE=..\mod\moomod.lib MODFILE=..\mod\moomod.lib
RSPFILE := $(EXEFILE,B,S/.*/&.RSP/) LIBRSPFILE := $(LIBFILE,B,S/.*/&.RSP/)
EXERSPFILE := $(EXEFILE,B,S/.*/&.RSP/)
all: lib exe
all: $(OBJS) hlt.obj # hlt.obj should be included into the library
echo $(OBJS) > $(RSPFILE) # but for an unknown reason, the linker was not able to
echo hlt.obj >> $(RSPFILE) # find the _halt_cpu symbol when halt.obj was added to
echo $(MODFILE) >> $(RSPFILE) # the library. i suspect 386asm not producing a fully
echo $(LDFLAGS) >> $(RSPFILE) # compatiable object file.
$(CC) @$(RSPFILE) /e $(EXEFILE)
exe: hlt.obj $(EXEOBJS)
echo $(EXEOBJS) > $(EXERSPFILE)
echo hlt.obj >> $(EXERSPFILE)
echo $(LIBFILE) >> $(EXERSPFILE)
echo $(MODFILE) >> $(EXERSPFILE)
echo $(LDFLAGS) >> $(EXERSPFILE)
$(CC) @$(EXERSPFILE) /e $(EXEFILE)
lib: $(LIBOBJS)
echo > $(LIBRSPFILE)
!foreach x $(.NEWER)
modname /r $x >> $(LIBRSPFILE)
!end
echo compress >> $(LIBRSPFILE)
echo update >> $(LIBRSPFILE)
echo quit exit >> $(LIBRSPFILE)
del $(LIBFILE)
lib32 $(LIBFILE) batch < $(LIBRSPFILE)
hlt.obj: hlt.asm hlt.obj: hlt.asm
386asm -twocase hlt.asm 386asm -twocase hlt.asm

2
moo/lib/std.c
View File

@ -3013,7 +3013,7 @@ static void (__interrupt *dos_prev_timer_intr_handler) (void);
#endif #endif
#if defined(_INTELC32_) #if defined(_INTELC32_)
#pragma interrupt(timer_intr_handler) #pragma interrupt(dos_timer_intr_handler)
static void dos_timer_intr_handler (void) static void dos_timer_intr_handler (void)
#else #else
static void __interrupt dos_timer_intr_handler (void) static void __interrupt dos_timer_intr_handler (void)