From: sparky4 Date: Sun, 13 Sep 2015 02:59:26 +0000 (-0500) Subject: I cannot use the UINT32 Variable! wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=0b144a0907c57f35e5d7ce1f1293afa802bb65cc;p=16.git I cannot use the UINT32 Variable! wwww modified: bcexmm.prj modified: exmmtest.map modified: makefile modified: scroll.exe modified: scroll.map modified: src/lib/16_head.h modified: src/lib/vgmsnd/stdtype.h modified: src/lib/vgmsnd/vgmSnd.c modified: src/lib/vgmsnd/vgmSnd.h modified: src/scroll.c modified: src/vgmtest.c modified: vgmtest.exe --- diff --git a/bcexmm.prj b/bcexmm.prj index 89bd32ac..82bf102e 100755 Binary files a/bcexmm.prj and b/bcexmm.prj differ diff --git a/exmmtest.map b/exmmtest.map index 8b0da36c..f05f9168 100755 --- a/exmmtest.map +++ b/exmmtest.map @@ -1,6 +1,6 @@ Open Watcom Linker Version 1.9 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/09/12 15:21:02 +Created on: 15/09/12 21:58:59 Executable Image: exmmtest.exe creating a DOS executable @@ -495,4 +495,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(clearenv.c) Stack size: 8000 (32768.) Memory size: 00011e70 (73328.) Entry point address: 0000:47f4 -Link time: 00:00.00 +Link time: 00:00.01 diff --git a/makefile b/makefile index 4d6056e4..0fa19f63 100755 --- a/makefile +++ b/makefile @@ -34,8 +34,9 @@ OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87 -onac -ol+ -ok####x FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS) DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ) +VGMSNDOBJ = 16_snd.$(OBJ) vgmSnd.$(OBJ) DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) -16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) vgmSnd.$(OBJ) 16_snd.$(OBJ) +16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) #3812intf.$(OBJ) GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) @@ -123,8 +124,10 @@ fmemtest.exe: fmemtest.$(OBJ) 16.lib exmmtest.exe: exmmtest.$(OBJ) 16.lib wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.map -vgmtest.exe: vgmtest.$(OBJ) 16.lib - wcl $(FLAGS) vgmtest.$(OBJ) 16.lib -fm=vgmtest.map +vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib + wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map + #====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.map + # #executable's objects @@ -194,18 +197,22 @@ exmmtest.$(OBJ): $(SRC)exmmtest.c vgmtest.$(OBJ): $(SRC)vgmtest.c wcl $(FLAGS) -c $(SRC)vgmtest.c + #====wcl -mc -c $(SRC)vgmtest.c # #non executable objects libraries # -16.lib: $(16LIBOBJS) gfx.lib doslib.lib - wlib -b 16.lib $(16LIBOBJS) gfx.lib doslib.lib +16.lib: $(16LIBOBJS) gfx.lib doslib.lib vgmsnd.lib + wlib -b -q 16.lib $(16LIBOBJS) gfx.lib doslib.lib vgmsnd.lib gfx.lib: $(GFXLIBOBJS) - wlib -b gfx.lib $(GFXLIBOBJS) + wlib -b -q gfx.lib $(GFXLIBOBJS) doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib - wlib -b doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib + wlib -b -q doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib + +vgmsnd.lib: $(VGMSNDOBJ) + wlib -b -q vgmsnd.lib $(VGMSNDOBJ) modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c wcl $(FLAGS) -c $(SRCLIB)modex16.c @@ -283,6 +290,7 @@ emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c 16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c wcl $(FLAGS) -c $(SRCLIB)16_snd.c + #====wcl -mc -c $(SRCLIB)16_snd.c jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c wcl $(FLAGS) -c $(JSMNLIB)jsmn.c @@ -292,6 +300,7 @@ kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c + #====wcl -c -mc $(VGMSNDLIB)vgmSnd.c #3812intf.$(OBJ): $(VGMSNDLIB)3812intf.h $(VGMSNDLIB)3812intf.c # wcl $(FLAGS) -c $(VGMSNDLIB)3812intf.c @@ -312,6 +321,7 @@ clean: .symbolic @wlib -n 16.lib @wlib -n gfx.lib @wlib -n doslib.lib + @wlib -n vgmsnd.lib @$(REMOVECOMMAND) *.16 @$(REMOVECOMMAND) *.16W @$(REMOVECOMMAND) *.16B @@ -326,6 +336,7 @@ clean: .symbolic @$(REMOVECOMMAND) *.hed @$(REMOVECOMMAND) *.MAP @$(REMOVECOMMAND) *.map + @$(REMOVECOMMAND) *.err @$(COPYCOMMAND) .git/config git_con.fig # @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC) # @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB) diff --git a/scroll.exe b/scroll.exe index 0777cd16..6e73d98e 100755 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/scroll.map b/scroll.map index e800b3d1..e3e1fca8 100755 --- a/scroll.map +++ b/scroll.map @@ -1,6 +1,6 @@ Open Watcom Linker Version 1.9 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/09/12 15:21:02 +Created on: 15/09/12 21:58:59 Executable Image: scroll.exe creating a DOS executable @@ -12,7 +12,7 @@ creating a DOS executable Group Address Size ===== ======= ==== -DGROUP 0c96:0000 00009b50 +DGROUP 0c95:0000 00009b50 @@ -24,26 +24,26 @@ Segment Class Group Address Size ======= ===== ===== ======= ==== BEGTEXT CODE AUTO 0000:0000 00000007 -_TEXT CODE AUTO 0000:0010 0000c792 -16_in13_DATA FAR_DATA AUTO 0c7b:0000 000001a4 -FAR_DATA FAR_DATA AUTO 0c95:0004 00000000 -_NULL BEGDATA DGROUP 0c96:0000 00000020 -_AFTERNULL BEGDATA DGROUP 0c98:0000 00000002 -CONST DATA DGROUP 0c98:0002 00000090 -CONST2 DATA DGROUP 0ca1:0002 00000132 -_DATA DATA DGROUP 0cb5:0000 00000aba -XIB DATA DGROUP 0d60:000a 00000000 -XI DATA DGROUP 0d60:000a 0000003c -XIE DATA DGROUP 0d64:0006 00000000 -YIB DATA DGROUP 0d64:0006 00000000 -YI DATA DGROUP 0d64:0006 00000012 -YIE DATA DGROUP 0d65:0008 00000000 -STRINGS DATA DGROUP 0d65:0008 00000000 -DATA DATA DGROUP 0d65:0008 00000000 -_emu_init_start EMU DGROUP 0d65:0008 00000000 -_emu_init_end EMU DGROUP 0d65:0008 00000000 -_BSS BSS DGROUP 0d66:0000 00000e4e -STACK STACK DGROUP 0e4b:0000 00008000 +_TEXT CODE AUTO 0000:0010 0000c782 +16_in13_DATA FAR_DATA AUTO 0c7a:0000 000001a4 +FAR_DATA FAR_DATA AUTO 0c94:0004 00000000 +_NULL BEGDATA DGROUP 0c95:0000 00000020 +_AFTERNULL BEGDATA DGROUP 0c97:0000 00000002 +CONST DATA DGROUP 0c97:0002 00000090 +CONST2 DATA DGROUP 0ca0:0002 00000132 +_DATA DATA DGROUP 0cb4:0000 00000aba +XIB DATA DGROUP 0d5f:000a 00000000 +XI DATA DGROUP 0d5f:000a 0000003c +XIE DATA DGROUP 0d63:0006 00000000 +YIB DATA DGROUP 0d63:0006 00000000 +YI DATA DGROUP 0d63:0006 00000012 +YIE DATA DGROUP 0d64:0008 00000000 +STRINGS DATA DGROUP 0d64:0008 00000000 +DATA DATA DGROUP 0d64:0008 00000000 +_emu_init_start EMU DGROUP 0d64:0008 00000000 +_emu_init_end EMU DGROUP 0d64:0008 00000000 +_BSS BSS DGROUP 0d65:0000 00000e4e +STACK STACK DGROUP 0e4a:0000 00008000 +----------------+ @@ -57,494 +57,494 @@ Address Symbol ======= ====== Module: scroll.o(/dos/z/16/src/scroll.c) -0000:01c4 main_ +0000:01c0 main_ Module: mapread.o(/dos/z/16/src/lib/mapread.c) -0000:070c+ jsoneq_ -0000:076e+ dump_ -0000:0b34* loadmap_ +0000:06fc+ jsoneq_ +0000:075e+ dump_ +0000:0b24* loadmap_ Module: jsmn.o(/dos/z/16/src/lib/jsmn/jsmn.c) -0000:1010 jsmn_parse_ -0000:130a jsmn_init_ +0000:1000 jsmn_parse_ +0000:12fa jsmn_init_ Module: /usr/watcom/lib286/dos/clibc.lib(stk) -0000:1333 __STK -0000:1353* __STKOVERFLOW_ +0000:1323 __STK +0000:1343* __STKOVERFLOW_ Module: /usr/watcom/lib286/dos/clibc.lib(fmalloc.c) -0000:136e _fmalloc_ -0000:136e malloc_ -0c96:0208+ ___fheap -0c96:020a ___fheapRover -0c96:020c ___LargestSizeB4Rover +0000:135e _fmalloc_ +0000:135e malloc_ +0c95:0208+ ___fheap +0c95:020a ___fheapRover +0c95:020c ___LargestSizeB4Rover Module: 16.lib(/dos/z/16/src/lib/timer.c) -0000:1480 start_timer_ -0000:14be elapsed_timer_ -0000:1500* time_in_seconds_ +0000:1470 start_timer_ +0000:14ae elapsed_timer_ +0000:14f0* time_in_seconds_ Module: 16.lib(/dos/z/16/src/lib/scroll16.c) -0000:154e walk_ -0000:1f24+ mapScrollRight_ -0000:2046+ mapScrollLeft_ -0000:2142+ mapScrollUp_ -0000:2258+ mapScrollDown_ -0000:2394 chkmap_ -0000:242e mapGoTo_ -0000:2500+ mapDrawTile_ -0000:25d0+ mapDrawRow_ -0000:267c+ mapDrawCol_ -0000:2728+ mapDrawWRow_ -0000:27b4* mapDrawWCol_ -0000:2842* qclean_ -0000:2860 shinku_ -0000:28ee+ animatePlayer_ +0000:153e walk_ +0000:1f14+ mapScrollRight_ +0000:2036+ mapScrollLeft_ +0000:2132+ mapScrollUp_ +0000:2248+ mapScrollDown_ +0000:2384 chkmap_ +0000:241e mapGoTo_ +0000:24f0+ mapDrawTile_ +0000:25c0+ mapDrawRow_ +0000:266c+ mapDrawCol_ +0000:2718+ mapDrawWRow_ +0000:27a4* mapDrawWCol_ +0000:2832* qclean_ +0000:2850 shinku_ +0000:28de+ animatePlayer_ Module: 16.lib(/dos/z/16/src/lib/bitmap.c) -0000:2bf4 bitmapLoadPcx_ -0000:2d18* bitmapLoadPcxTiles_ +0000:2be4 bitmapLoadPcx_ +0000:2d08* bitmapLoadPcxTiles_ Module: 16.lib(/dos/z/16/src/lib/planar.c) -0000:2e20 planar_buf_from_bitmap_ -0000:2eca+ planar_buf_alloc_ -0000:2f40* planar_buf_free_ +0000:2e10 planar_buf_from_bitmap_ +0000:2eba+ planar_buf_alloc_ +0000:2f30* planar_buf_free_ Module: 16.lib(/dos/z/16/src/lib/16_in.c) -0c96:0daa+ _inpu -0000:30a8+ INL_KeyService_ -0000:31f8+ Mouse_ -0000:3248+ IN_GetJoyAbs_ -0000:34e0+ IN_GetJoyButtonsDB_ -0000:3650+ IN_SetupJoy_ -0000:3740 IN_Startup_ -0000:37f6 IN_Default_ -0000:388a IN_Shutdown_ -0000:38c8* IN_SetKeyHook_ -0000:38e2+ IN_ClearKeysDown_ -0000:3952* IN_ReadCursor_ -0000:3a24 IN_ReadControl_ -0000:3d28* IN_SetControlType_ -0000:3d42* IN_GetScanName_ -0000:3da2* IN_WaitForKey_ -0000:3dc0* IN_WaitForASCII_ -0000:3dde+ IN_AckBack_ -0000:3e70* IN_Ack_ -0000:3ed0+ IN_IsUserInput_ -0000:3f2c* IN_UserInput_ -0000:3f7c IN_KeyDown_ -0000:3f9e+ IN_ClearKey_ -0000:3fda* IN_qb_ +0c95:0daa+ _inpu +0000:3098+ INL_KeyService_ +0000:31e8+ Mouse_ +0000:3238+ IN_GetJoyAbs_ +0000:34d0+ IN_GetJoyButtonsDB_ +0000:3640+ IN_SetupJoy_ +0000:3730 IN_Startup_ +0000:37e6 IN_Default_ +0000:387a IN_Shutdown_ +0000:38b8* IN_SetKeyHook_ +0000:38d2+ IN_ClearKeysDown_ +0000:3942* IN_ReadCursor_ +0000:3a14 IN_ReadControl_ +0000:3d18* IN_SetControlType_ +0000:3d32* IN_GetScanName_ +0000:3d92* IN_WaitForKey_ +0000:3db0* IN_WaitForASCII_ +0000:3dce+ IN_AckBack_ +0000:3e60* IN_Ack_ +0000:3ec0+ IN_IsUserInput_ +0000:3f1c* IN_UserInput_ +0000:3f6c IN_KeyDown_ +0000:3f8e+ IN_ClearKey_ +0000:3fca* IN_qb_ Module: 16.lib(/dos/z/16/src/lib/16text.c) -0000:4068 textInit_ -0c96:0f00 _romFonts +0000:4058 textInit_ +0c95:0f00 _romFonts Module: 16.lib(/dos/z/16/src/lib/modex16.c) -0000:4278 VGAmodeX_ -0000:4312+ modexEnter_ -0000:43a8 modexLeave_ -0000:43bc modexDefaultPage_ -0000:4412 modexNextPage_ -0000:4478 modexNextPage0_ -0000:44d6 modexShowPage_ -0000:4568* modexPanPage_ -0000:4584* modexSelectPlane_ -0000:45a4 modexClearRegion_ -0000:4692* oldDrawBmp_ -0000:478c* modexDrawBmp_ -0000:47b2 modexDrawBmpRegion_ -0000:48b2* modexDrawPlanarBuf_ -0000:48cc* modexDrawSprite_ -0000:48f2+ modexDrawSpriteRegion_ -0000:49fe modexCopyPageRegion_ -0000:4b0e* modexFadeOn_ -0000:4b3a* modexFadeOff_ -0000:4b64* modexFlashOn_ -0000:4b8e* modexFlashOff_ -0000:4c34+ modexPalSave_ -0000:4c66 modexNewPal_ -0000:4caa* modexLoadPalFile_ -0000:4d4c* modexSavePalFile_ -0000:4db6* modexPalBlack_ -0000:4ddc* modexPalWhite_ -0000:4e02+ modexPalUpdate_ -0000:51b2+ modexPalUpdate1_ -0000:5208* modexPalUpdate0_ -0000:524a+ chkcolor_ -0000:5430 modexputPixel_ -0000:549a* modexgetPixel_ -0000:54f2* modexhlin_ -0000:5558 modexprint_ -0000:56a2* modexprintbig_ -0000:57e6 modexWaitBorder_ -0c96:09b4 _VGA +0000:4268 VGAmodeX_ +0000:4302+ modexEnter_ +0000:4398 modexLeave_ +0000:43ac modexDefaultPage_ +0000:4402 modexNextPage_ +0000:4468 modexNextPage0_ +0000:44c6 modexShowPage_ +0000:4558* modexPanPage_ +0000:4574* modexSelectPlane_ +0000:4594 modexClearRegion_ +0000:4682* oldDrawBmp_ +0000:477c* modexDrawBmp_ +0000:47a2 modexDrawBmpRegion_ +0000:48a2* modexDrawPlanarBuf_ +0000:48bc* modexDrawSprite_ +0000:48e2+ modexDrawSpriteRegion_ +0000:49ee modexCopyPageRegion_ +0000:4afe* modexFadeOn_ +0000:4b2a* modexFadeOff_ +0000:4b54* modexFlashOn_ +0000:4b7e* modexFlashOff_ +0000:4c24+ modexPalSave_ +0000:4c56 modexNewPal_ +0000:4c9a* modexLoadPalFile_ +0000:4d3c* modexSavePalFile_ +0000:4da6* modexPalBlack_ +0000:4dcc* modexPalWhite_ +0000:4df2+ modexPalUpdate_ +0000:51a2+ modexPalUpdate1_ +0000:51f8* modexPalUpdate0_ +0000:523a+ chkcolor_ +0000:5420 modexputPixel_ +0000:548a* modexgetPixel_ +0000:54e2* modexhlin_ +0000:5548 modexprint_ +0000:5692* modexprintbig_ +0000:57d6 modexWaitBorder_ +0c95:09b4 _VGA Module: /usr/watcom/lib286/dos/clibc.lib(sprintf.c) -0000:580a sprintf_ +0000:57fa sprintf_ Module: /usr/watcom/lib286/dos/clibc.lib(sound.c) -0000:5837 sound_ -0000:58cd nosound_ +0000:5827 sound_ +0000:58bd nosound_ Module: 16.lib(/dos/z/16/src/lib/bakapee.c) -0000:58f8 pdump_ -0000:5952+ cls_ -0000:598c+ colortest_ -0000:59bc+ colorz_ -0000:59fe+ ssd_ -0000:5a82+ dingpp_ -0000:5aac+ dingo_ -0000:5afc+ dingas_ -0000:5b54+ dingu_ -0000:5b8c+ dingq_ -0000:5bf4* ding_ +0000:58e8 pdump_ +0000:5942+ cls_ +0000:597c+ colortest_ +0000:59ac+ colorz_ +0000:59ee+ ssd_ +0000:5a72+ dingpp_ +0000:5a9c+ dingo_ +0000:5aec+ dingas_ +0000:5b44+ dingu_ +0000:5b7c+ dingq_ +0000:5be4* ding_ Module: /usr/watcom/lib286/dos/clibc.lib(printf.c) -0000:5f62 printf_ +0000:5f52 printf_ Module: 16.lib(/dos/z/16/src/lib/wcpu/wcpu.c) -0000:5f90 detectcpu_ +0000:5f80 detectcpu_ Module: /usr/watcom/lib286/dos/clibc.lib(cstart) 0000:0003* ___begtext -0c96:0000* __nullarea -0000:5fe4 _cstart_ -0000:60b9* _Not_Enough_Memory_ -0000:61e4 __exit_ -0000:6203 __do_exit_with_msg__ -0000:6246 __GETDS +0c95:0000* __nullarea +0000:5fd4 _cstart_ +0000:60a9* _Not_Enough_Memory_ +0000:61d4 __exit_ +0000:61f3 __do_exit_with_msg__ +0000:6236 __GETDS Module: /usr/watcom/lib286/dos/clibc.lib(cmodel) -0000:6250 _small_code_ -0000:6250* CodeModelMismatch +0000:6240 _small_code_ +0000:6240* CodeModelMismatch Module: /usr/watcom/lib286/dos/clibc.lib(strncmp.c) -0000:6250 strncmp_ +0000:6240 strncmp_ Module: /usr/watcom/lib286/dos/clibc.lib(strstr.c) -0000:628f strstr_ +0000:627f strstr_ Module: /usr/watcom/lib286/dos/clibc.lib(atoi.c) -0000:6349 atoi_ +0000:6339 atoi_ Module: /usr/watcom/lib286/dos/clibc.lib(fopen.c) -0000:63b1+ __open_flags_ -0000:65a2+ _fsopen_ -0000:6606 fopen_ -0000:66dc* freopen_ +0000:63a1+ __open_flags_ +0000:6592+ _fsopen_ +0000:65f6 fopen_ +0000:66cc* freopen_ Module: /usr/watcom/lib286/dos/clibc.lib(fread.c) -0000:6751 fread_ +0000:6741 fread_ Module: /usr/watcom/lib286/dos/clibc.lib(errno.c) -0000:6938 __get_errno_ptr_ -0000:693f __get_doserrno_ptr_ -0c96:1818+ _errno -0c96:181a+ __doserrno +0000:6928 __get_errno_ptr_ +0000:692f __get_doserrno_ptr_ +0c95:1818+ _errno +0c95:181a+ __doserrno Module: /usr/watcom/lib286/dos/clibc.lib(iob.c) -0c96:09e4 ___iob -0c96:0b4c __fmode -0c96:181c ___OpenStreams -0c96:1820 ___ClosedStreams +0c95:09e4 ___iob +0c95:0b4c __fmode +0c95:181c ___OpenStreams +0c95:1820 ___ClosedStreams Module: /usr/watcom/lib286/dos/clibc.lib(fprintf.c) -0000:6946 fprintf_ +0000:6936 fprintf_ Module: /usr/watcom/lib286/dos/clibc.lib(frealloc.c) -0000:6973* _frealloc_ -0000:6973 realloc_ +0000:6963* _frealloc_ +0000:6963 realloc_ Module: /usr/watcom/lib286/dos/clibc.lib(strncpy.c) -0000:6a39 strncpy_ +0000:6a29 strncpy_ Module: /usr/watcom/lib286/dos/clibc.lib(xmsg.c) -0000:6a75* __exit_with_msg_ -0000:6a78 __fatal_runtime_error_ +0000:6a65* __exit_with_msg_ +0000:6a68 __fatal_runtime_error_ Module: /usr/watcom/lib286/dos/clibc.lib(crwdata) -0c96:0b4e __curbrk -0c96:0b56 __STACKLOW -0c96:0b58 __STACKTOP -0c96:0b5a __cbyte -0c96:0b5c __child -0c96:0b5e __no87 -0c96:0b6c ___FPE_handler -0c96:0b50 __psp -0c96:0b60 __get_ovl_stack -0c96:0b64 __restore_ovl_stack -0c96:0b68 __close_ovl_file -0c96:0b70 __LpCmdLine -0c96:0b74 __LpPgmName -0c96:0b52 __osmajor -0c96:0b53 __osminor -0c96:0b54 __osmode -0c96:0b55 __HShift +0c95:0b4e __curbrk +0c95:0b56 __STACKLOW +0c95:0b58 __STACKTOP +0c95:0b5a __cbyte +0c95:0b5c __child +0c95:0b5e __no87 +0c95:0b6c ___FPE_handler +0c95:0b50 __psp +0c95:0b60 __get_ovl_stack +0c95:0b64 __restore_ovl_stack +0c95:0b68 __close_ovl_file +0c95:0b70 __LpCmdLine +0c95:0b74 __LpPgmName +0c95:0b52 __osmajor +0c95:0b53 __osminor +0c95:0b54 __osmode +0c95:0b55 __HShift Module: /usr/watcom/lib286/dos/clibc.lib(hpgrw086.c) -0000:6a92 __CMain_nheapgrow_ +0000:6a82 __CMain_nheapgrow_ Module: /usr/watcom/lib286/dos/clibc.lib(mem.c) -0000:6aa0 __MemAllocator -0000:6b6a __MemFree +0000:6a90 __MemAllocator +0000:6b5a __MemFree Module: /usr/watcom/lib286/dos/clibc.lib(growseg.c) -0000:6cc7 __GrowSeg_ +0000:6cb7 __GrowSeg_ Module: /usr/watcom/lib286/dos/clibc.lib(allocseg.c) -0000:6db9 __AllocSeg_ +0000:6da9 __AllocSeg_ Module: /usr/watcom/lib286/dos/clibc.lib(fmemneed.c) -0000:6e50 __fmemneed_ +0000:6e40 __fmemneed_ Module: /usr/watcom/lib286/dos/clibc.lib(nmalloc.c) -0000:6e53 _nmalloc_ -0c96:0b78 ___nheapbeg -0c96:0b7a ___MiniHeapRover -0c96:0b7c ___LargestSizeB4MiniHeapRover +0000:6e43 _nmalloc_ +0c95:0b78 ___nheapbeg +0c95:0b7a ___MiniHeapRover +0c95:0b7c ___LargestSizeB4MiniHeapRover Module: /usr/watcom/lib286/dos/clibc.lib(clockdos.c) -0000:6f24+ __ibm_bios_get_ticks_ -0000:6f96 clock_ +0000:6f14+ __ibm_bios_get_ticks_ +0000:6f86 clock_ Module: /usr/watcom/lib286/dos/clibc.lib(i4d) -0000:6fbe __I4D -0000:7007 __U4D +0000:6fae __I4D +0000:6ff7 __U4D Module: /usr/watcom/lib286/dos/clibc.lib(_8087) -0c96:0b86 __8087 -0c96:0b87 __real87 -0c96:0b88 __dos87emucall -0c96:0b8a __dos87real +0c95:0b86 __8087 +0c95:0b87 __real87 +0c95:0b88 __dos87emucall +0c95:0b8a __dos87real Module: /usr/watcom/lib286/dos/clibc.lib(fltused.c) -0c96:0b8c _fltused_ +0c95:0b8c _fltused_ Module: /usr/watcom/lib286/dos/clibc.lib(fclose.c) -0000:708c __doclose_ -0000:7135 __shutdown_stream_ -0000:714c fclose_ -0c96:1828+ ___RmTmpFileFn +0000:707c __doclose_ +0000:7125 __shutdown_stream_ +0000:713c fclose_ +0c95:1828+ ___RmTmpFileFn Module: /usr/watcom/lib286/dos/clibc.lib(exit.c) -0000:7196+ __null_int23_exit_ -0000:7197 exit_ -0000:71c4* _exit_ -0c96:0b8e+ ___int23_exit -0c96:0b90 ___FPE_handler_exit +0000:7186+ __null_int23_exit_ +0000:7187 exit_ +0000:71b4* _exit_ +0c95:0b8e+ ___int23_exit +0c95:0b90 ___FPE_handler_exit Module: /usr/watcom/lib286/dos/clibc.lib(fseek.c) -0000:7249 fseek_ +0000:7239 fseek_ Module: /usr/watcom/lib286/dos/clibc.lib(fgetc.c) -0000:738c __fill_buffer_ -0000:7476 fgetc_ +0000:737c __fill_buffer_ +0000:7466 fgetc_ Module: /usr/watcom/lib286/dos/clibc.lib(ffree.c) -0000:7513 _ffree_ -0000:7513 free_ +0000:7503 _ffree_ +0000:7503 free_ Module: /usr/watcom/lib286/dos/clibc.lib(intx086.c) -0000:7555+ int86x_ -0000:75ec int86_ +0000:7545+ int86x_ +0000:75dc int86_ Module: /usr/watcom/lib286/dos/clibc.lib(d_getvec.c) -0000:7616 _dos_getvect_ +0000:7606 _dos_getvect_ Module: /usr/watcom/lib286/dos/clibc.lib(d_setvec.c) -0000:7621 _dos_setvect_ +0000:7611 _dos_setvect_ Module: /usr/watcom/lib286/dos/clibc.lib(argcv.c) -0c96:182a __argv -0c96:182e ___argv -0c96:1832 __argc -0c96:1834 ___argc +0c95:182a __argv +0c95:182e ___argv +0c95:1832 __argc +0c95:1834 ___argc Module: 16.lib(/dos/z/16/src/lib/16_head.c) -0000:763e* wait_ -0000:767e* filesize_ -0000:76d8* printmeminfoline_ -0000:78ba US_CheckParm_ +0000:762e* wait_ +0000:766e* filesize_ +0000:76c8* printmeminfoline_ +0000:78aa US_CheckParm_ Module: /usr/watcom/lib286/dos/clibc.lib(fwrite.c) -0000:798c fwrite_ +0000:797c fwrite_ Module: /usr/watcom/lib286/dos/clibc.lib(rand.c) -0000:7b79 rand_ -0000:7bb9* srand_ +0000:7b69 rand_ +0000:7ba9* srand_ Module: /usr/watcom/lib286/dos/clibc.lib(vsprintf.c) -0000:7bf5 vsprintf_ +0000:7be5 vsprintf_ Module: /usr/watcom/lib286/dos/clibc.lib(nonibm.c) -0000:7c1a+ __is_nonIBM_ -0c96:0ba8 ___NonIBM +0000:7c0a+ __is_nonIBM_ +0c95:0ba8 ___NonIBM Module: /usr/watcom/lib286/dos/clibc.lib(delay.c) -0000:7c60 delay_ +0000:7c50 delay_ Module: /usr/watcom/lib286/dos/clibc.lib(fprtf.c) -0000:7dcc __fprtf_ +0000:7dbc __fprtf_ Module: /usr/watcom/lib286/dos/clibc.lib(cmain086.c) -0000:7e8d __CMain +0000:7e7d __CMain Module: /usr/watcom/lib286/dos/clibc.lib(initrtns.c) -0000:7ee9* __FInitRtns -0000:7eed __InitRtns -0000:7f48* __FFiniRtns -0000:7f4c __FiniRtns +0000:7ed9* __FInitRtns +0000:7edd __InitRtns +0000:7f38* __FFiniRtns +0000:7f3c __FiniRtns Module: /usr/watcom/lib286/dos/clibc.lib(uselfn.c) -0c96:0baa ___uselfn +0c95:0baa ___uselfn Module: /usr/watcom/lib286/dos/clibc.lib(dosseg) -0000:7fb0 __DOSseg__ +0000:7fa0 __DOSseg__ Module: /usr/watcom/lib286/dos/clibc.lib(istable.c) -0c96:00b2 __IsTable +0c95:00b2 __IsTable Module: /usr/watcom/lib286/dos/clibc.lib(comtflag.c) -0000:7fb1* __set_commode_ -0c96:0bac __commode +0000:7fa1* __set_commode_ +0c95:0bac __commode Module: /usr/watcom/lib286/dos/clibc.lib(seterrno.c) -0000:7fbd __set_errno_ -0000:7fcf* __set_EDOM_ -0000:7fdf __set_ERANGE_ -0000:7fef* __set_EINVAL_ -0000:8002 __set_doserrno_ +0000:7fad __set_errno_ +0000:7fbf* __set_EDOM_ +0000:7fcf __set_ERANGE_ +0000:7fdf* __set_EINVAL_ +0000:7ff2 __set_doserrno_ Module: /usr/watcom/lib286/dos/clibc.lib(tolower.c) -0000:800c tolower_ +0000:7ffc tolower_ Module: /usr/watcom/lib286/dos/clibc.lib(open.c) -0000:81fc* open_ -0000:8232 sopen_ +0000:81ec* open_ +0000:8222 sopen_ Module: /usr/watcom/lib286/dos/clibc.lib(chktty.c) -0000:825f __chktty_ +0000:824f __chktty_ Module: /usr/watcom/lib286/dos/clibc.lib(freefp.c) -0000:8288 __freefp_ -0000:8303 __purgefp_ +0000:8278 __freefp_ +0000:82f3 __purgefp_ Module: /usr/watcom/lib286/dos/clibc.lib(allocfp.c) -0000:8342 __allocfp_ +0000:8332 __allocfp_ Module: /usr/watcom/lib286/dos/clibc.lib(qread.c) -0000:845e __qread_ +0000:844e __qread_ Module: /usr/watcom/lib286/dos/clibc.lib(ioalloc.c) -0000:847c __ioalloc_ +0000:846c __ioalloc_ Module: /usr/watcom/lib286/dos/clibc.lib(initfile.c) -0000:8512 __InitFiles_ +0000:8502 __InitFiles_ Module: /usr/watcom/lib286/dos/clibc.lib(ioexit.c) -0000:8658* fcloseall_ -0000:865d __full_io_exit_ +0000:8648* fcloseall_ +0000:864d __full_io_exit_ Module: /usr/watcom/lib286/dos/clibc.lib(fmsize.c) -0000:8665* _msize_ -0000:8665 _fmsize_ +0000:8655* _msize_ +0000:8655 _fmsize_ Module: /usr/watcom/lib286/dos/clibc.lib(nexpand.c) -0000:8676 __HeapManager_expand_ -0000:87eb _nexpand_ +0000:8666 __HeapManager_expand_ +0000:87db _nexpand_ Module: /usr/watcom/lib286/dos/clibc.lib(fexpand.c) -0000:883b _fexpand_ -0000:883b* _expand_ +0000:882b _fexpand_ +0000:882b* _expand_ Module: /usr/watcom/lib286/dos/clibc.lib(enterdb.c) -0000:886c __EnterWVIDEO_ -0c96:0bae+ ___WD_Present +0000:885c __EnterWVIDEO_ +0c95:0bae+ ___WD_Present Module: /usr/watcom/lib286/dos/clibc.lib(heapgrow.c) -0000:8890* _heapgrow_ -0000:8890* _fheapgrow_ -0000:8891 _nheapgrow_ +0000:8880* _heapgrow_ +0000:8880* _fheapgrow_ +0000:8881 _nheapgrow_ Module: /usr/watcom/lib286/dos/clibc.lib(heapen.c) -0000:8905* _heapenable_ -0c96:0bb0 ___heap_enabled +0000:88f5* _heapenable_ +0c95:0bb0 ___heap_enabled Module: /usr/watcom/lib286/dos/clibc.lib(amblksiz.c) -0c96:0bb2 __amblksiz +0c95:0bb2 __amblksiz Module: /usr/watcom/lib286/dos/clibc.lib(nmemneed.c) -0000:8916 __nmemneed_ +0000:8906 __nmemneed_ Module: /usr/watcom/lib286/dos/clibc.lib(grownear.c) -0000:899e __LastFree_ -0000:8a17 __ExpandDGROUP_ +0000:898e __LastFree_ +0000:8a07 __ExpandDGROUP_ Module: /usr/watcom/lib286/dos/clibc.lib(i4m) -0000:8b24 __I4M -0000:8b24 __U4M +0000:8b14 __I4M +0000:8b14 __U4M Module: /usr/watcom/lib286/dos/clibc.lib(chk8087.c) -0000:8b58* _fpreset_ -0000:8b83 __init_8087_ -0000:8baa+ __default_sigfpe_handler_ -0000:8bbb __chk8087_ +0000:8b48* _fpreset_ +0000:8b73 __init_8087_ +0000:8b9a+ __default_sigfpe_handler_ +0000:8bab __chk8087_ Module: /usr/watcom/lib286/dos/clibc.lib(setefg.c) -0000:8c26 __setEFGfmt_ +0000:8c16 __setEFGfmt_ Module: /usr/watcom/lib286/dos/clibc.lib(__lseek.c) -0000:8c38 __lseek_ +0000:8c28 __lseek_ Module: /usr/watcom/lib286/dos/clibc.lib(_clse.c) -0000:8c70 __close_ +0000:8c60 __close_ Module: /usr/watcom/lib286/dos/clibc.lib(flush.c) -0000:8c9f __flush_ +0000:8c8f __flush_ Module: /usr/watcom/lib286/dos/clibc.lib(lseek.c) -0000:8dca lseek_ +0000:8dba lseek_ Module: /usr/watcom/lib286/dos/clibc.lib(tell.c) -0000:8df5 tell_ +0000:8de5 tell_ Module: /usr/watcom/lib286/dos/clibc.lib(flushall.c) -0000:8e04 __flushall_ -0000:8e5f flushall_ +0000:8df4 __flushall_ +0000:8e4f flushall_ Module: /usr/watcom/lib286/dos/clibc.lib(gtche.c) -0000:8e64 getche_ +0000:8e54 getche_ Module: /usr/watcom/lib286/dos/clibc.lib(nfree.c) -0000:8e7e _nfree_ -0c96:1836+ ___MiniHeapFreeRover +0000:8e6e _nfree_ +0c95:1836+ ___MiniHeapFreeRover Module: /usr/watcom/lib286/dos/clibc.lib(intr.c) -0000:8f76 intr_ +0000:8f66 intr_ Module: /usr/watcom/lib286/dos/clibc.lib(segread.c) -0000:8f88 segread_ +0000:8f78 segread_ Module: /usr/watcom/lib286/dos/clibc.lib(initargv.c) -0000:8fa8 __Init_Argv_ -0000:9004+ _getargv_ -0000:91fd __Fini_Argv_ +0000:8f98 __Init_Argv_ +0000:8ff4+ _getargv_ +0000:91ed __Fini_Argv_ Module: /usr/watcom/lib286/dos/clibc.lib(kbhit.c) -0000:921f kbhit_ +0000:920f kbhit_ Module: /usr/watcom/lib286/dos/clibc.lib(ftell.c) -0000:9236 ftell_ +0000:9226 ftell_ Module: /usr/watcom/lib286/dos/clibc.lib(ltoa.c) -0000:928e ultoa_ -0000:92fd* ltoa_ +0000:927e ultoa_ +0000:92ed* ltoa_ Module: /usr/watcom/lib286/dos/clibc.lib(qwrit.c) -0000:932b __qwrite_ +0000:931b __qwrite_ Module: /usr/watcom/lib286/dos/clibc.lib(fputc.c) -0000:9382 fputc_ +0000:9372 fputc_ Module: /usr/watcom/lib286/dos/clibc.lib(prtf.c) -0000:944a __prtf_ +0000:943a __prtf_ Module: /usr/watcom/lib286/dos/clibc.lib(___argc.c) -0c96:183c ____Argv -0c96:1840 ____Argc +0c95:183c ____Argv +0c95:1840 ____Argc Module: /usr/watcom/lib286/dos/clibc.lib(sgdef086) -0c96:0caa __Start_XI -0c96:0ce6 __End_XI -0c96:0ce6 __Start_YI -0c96:0cf8 __End_YI +0c95:0caa __Start_XI +0c95:0ce6 __End_XI +0c95:0ce6 __Start_YI +0c95:0cf8 __End_YI Module: /usr/watcom/lib286/dos/clibc.lib(opendos.c) -0000:a204 _dos_open_ +0000:a1f4 _dos_open_ Module: /usr/watcom/lib286/dos/clibc.lib(iomode.c) -0000:a228 __GetIOMode_ -0000:a24d __SetIOMode_nogrow_ -0c96:0bb4 ___NFiles -0c96:0bb6 ___init_mode -0c96:0bde ___io_mode +0000:a218 __GetIOMode_ +0000:a23d __SetIOMode_nogrow_ +0c95:0bb4 ___NFiles +0c95:0bb6 ___init_mode +0c95:0bde ___io_mode Module: /usr/watcom/lib286/dos/clibc.lib(isatt.c) -0000:a270 isatty_ +0000:a260 isatty_ Module: /usr/watcom/lib286/dos/clibc.lib(dosret.c) -0000:a28c* _dosretax_ -0000:a291* _dosret0_ -0000:a298 __set_errno_dos_ -0000:a2f2* __set_errno_dos_reterr_ +0000:a27c* _dosretax_ +0000:a281* _dosret0_ +0000:a288 __set_errno_dos_ +0000:a2e2* __set_errno_dos_reterr_ Module: /usr/watcom/lib286/dos/clibc.lib(umaskval.c) -0c96:0bf6 ___umaskval +0c95:0bf6 ___umaskval Module: /usr/watcom/lib286/dos/clibc.lib(creatdos.c) -0000:a2fc _dos_creat_ -0000:a31e* _dos_creatnew_ +0000:a2ec _dos_creat_ +0000:a30e* _dos_creatnew_ Module: /usr/watcom/lib286/dos/clibc.lib(stiomode.c) -0000:a33e+ __grow_iomode_ -0000:a3fb+ __shrink_iomode_ -0000:a434 __SetIOMode_ +0000:a32e+ __grow_iomode_ +0000:a3eb+ __shrink_iomode_ +0000:a424 __SetIOMode_ Module: /usr/watcom/lib286/dos/clibc.lib(bfree.c) -0000:a494 _bfree_ +0000:a484 _bfree_ Module: /usr/watcom/lib286/dos/clibc.lib(bexpand.c) -0000:a4b5 _bexpand_ +0000:a4a5 _bexpand_ Module: /usr/watcom/lib286/dos/clibc.lib(sbrk.c) -0000:a50a* sbrk_ -0000:a519 __brk_ +0000:a4fa* sbrk_ +0000:a509 __brk_ Module: /usr/watcom/lib286/dos/clibc.lib(8087cw.c) -0c96:0bf8 __8087cw +0c95:0bf8 __8087cw Module: /usr/watcom/lib286/dos/clibc.lib(save8087.c) -0c96:0bfa ___Save8087 -0c96:0bfc ___Rest8087 +0c95:0bfa ___Save8087 +0c95:0bfc ___Rest8087 Module: /usr/watcom/lib286/dos/clibc.lib(grabfp87.c) -0000:a582 __GrabFP87_ +0000:a572 __GrabFP87_ Module: /usr/watcom/lib286/dos/clibc.lib(init8087) -0000:a5a0* __init_8087_emu -0000:a5a4 __x87id +0000:a590* __init_8087_emu +0000:a594 __x87id Module: /usr/watcom/lib286/dos/clibc.lib(noefgfmt.c) -0c96:0bfe ___EFG_printf -0c96:0c00 ___EFG_scanf +0c95:0bfe ___EFG_printf +0c95:0c00 ___EFG_scanf Module: /usr/watcom/lib286/math87c.lib(efgfmt.c) -0000:a5f4 _EFG_Format_ +0000:a5e4 _EFG_Format_ Module: /usr/watcom/lib286/math87c.lib(cnvs2d.c) -0000:a780 __cnvs2d_ +0000:a770 __cnvs2d_ Module: /usr/watcom/lib286/dos/clibc.lib(fsync.c) -0000:a797 fsync_ +0000:a787 fsync_ Module: /usr/watcom/lib286/dos/clibc.lib(dointr) -0000:a79a _DoINTR_ +0000:a78a _DoINTR_ Module: /usr/watcom/lib286/dos/clibc.lib(histsplt.c) -0c96:1844 ___historical_splitparms +0c95:1844 ___historical_splitparms Module: /usr/watcom/lib286/dos/clibc.lib(fflush.c) -0000:ab13 fflush_ +0000:ab03 fflush_ Module: /usr/watcom/lib286/dos/clibc.lib(alphabet.c) -0c96:008c ___Alphabet +0c95:008c ___Alphabet Module: /usr/watcom/lib286/dos/clibc.lib(wctomb.c) -0000:ab24 wctomb_ +0000:ab14 wctomb_ Module: /usr/watcom/lib286/dos/clibc.lib(itoa.c) -0000:ab4d+ utoa_ -0000:abaa itoa_ +0000:ab3d+ utoa_ +0000:ab9a itoa_ Module: /usr/watcom/lib286/dos/clibc.lib(strupr.c) -0000:abcd strupr_ +0000:abbd strupr_ Module: /usr/watcom/lib286/dos/clibc.lib(mbisdbcs.c) -0c96:1846 ___IsDBCS +0c95:1846 ___IsDBCS Module: /usr/watcom/lib286/dos/clibc.lib(mbislead.c) -0000:abef* _ismbblead_ -0c96:1848 ___MBCSIsTable +0000:abdf* _ismbblead_ +0c95:1848 ___MBCSIsTable Module: /usr/watcom/lib286/dos/clibc.lib(lltoa.c) -0000:ac09 ulltoa_ -0000:acee* lltoa_ +0000:abf9 ulltoa_ +0000:acde* lltoa_ Module: /usr/watcom/lib286/dos/clibc.lib(doserror) -0000:ad50 __doserror_ +0000:ad40 __doserror_ Module: /usr/watcom/lib286/dos/clibc.lib(iomodtty.c) -0000:ad5c __ChkTTYIOMode_ -0000:ad98* __IOMode_ +0000:ad4c __ChkTTYIOMode_ +0000:ad88* __IOMode_ Module: /usr/watcom/lib286/dos/clibc.lib(fpe87) -0000:adaa __Init_FPE_handler_ -0000:ade3 __Fini_FPE_handler_ -0000:ae1a* __FPEHandler +0000:ad9a __Init_FPE_handler_ +0000:add3 __Fini_FPE_handler_ +0000:ae0a* __FPEHandler Module: /usr/watcom/lib286/dos/clibc.lib(rtcntrl.c) -0000:b0ac* _SetLD64bit_ -0000:b0b7* _SetLD80bit_ -0000:b0c2 _LDisDouble_ +0000:b09c* _SetLD64bit_ +0000:b0a7* _SetLD80bit_ +0000:b0b2 _LDisDouble_ Module: /usr/watcom/lib286/math87c.lib(ldcvt.c) -0000:b1ee _LDScale10x_ -0000:b74b __LDcvt_ +0000:b1de _LDScale10x_ +0000:b73b __LDcvt_ Module: /usr/watcom/lib286/noemu87.lib(emustub.asm) 0000:0000* FJSRQQ 0000:0000* FISRQQ @@ -555,32 +555,32 @@ Module: /usr/watcom/lib286/noemu87.lib(emustub.asm) 0000:0000* FJARQQ 0000:0000* FICRQQ 0000:0000* FIARQQ -0000:bc78 __init_87_emulator +0000:bc68 __init_87_emulator Module: /usr/watcom/lib286/math87c.lib(strtod.c) -0000:c1ed+ __Strtold_ -0000:c399 strtod_ +0000:c1dd+ __Strtold_ +0000:c389 strtod_ Module: /usr/watcom/lib286/dos/clibc.lib(filedos.c) -0000:c52f* _dos_close_ -0000:c53b _dos_commit_ +0000:c51f* _dos_close_ +0000:c52b _dos_commit_ Module: /usr/watcom/lib286/dos/clibc.lib(mbinit.c) -0000:c587 __mbinit_ -0c96:0ca6+ ___MBCodePage +0000:c577 __mbinit_ +0c95:0ca6+ ___MBCodePage Module: /usr/watcom/lib286/dos/clibc.lib(fpeint.c) -0c96:0ca8 ___FPE_int +0c95:0ca8 ___FPE_int Module: /usr/watcom/lib286/math87c.lib(ldclass.c) -0000:c67a __LDClass_ -0000:c6c8* _FLClass_ +0000:c66a __LDClass_ +0000:c6b8* _FLClass_ Module: /usr/watcom/lib286/math87c.lib(bufld086) -0000:c6da __ZBuf2LD +0000:c6ca __ZBuf2LD Module: /usr/watcom/lib286/math87c.lib(inf_nan.c) -0c96:01b4* ___f_infinity -0c96:01b8* ___f_posqnan -0c96:01bc ___d_infinity -0c96:01c4 ___d_posqnan -0c96:01cc* ___ld_infinity -0c96:01d4* ___ld_posqnan +0c95:01b4* ___f_infinity +0c95:01b8* ___f_posqnan +0c95:01bc ___d_infinity +0c95:01c4 ___d_posqnan +0c95:01cc* ___ld_infinity +0c95:01d4* ___ld_posqnan Module: /usr/watcom/lib286/dos/clibc.lib(hugeval.c) -0c96:01dc __HugeValue +0c95:01dc __HugeValue +--------------------+ @@ -598,6 +598,6 @@ Module: /usr/watcom/lib286/dos/clibc.lib(hugeval.c) +-----------------------+ Stack size: 8000 (32768.) -Memory size: 000164b0 (91312.) -Entry point address: 0000:5fe4 +Memory size: 000164a0 (91296.) +Entry point address: 0000:5fd4 Link time: 00:00.01 diff --git a/src/lib/16_head.h b/src/lib/16_head.h index 5634fa39..bb0d555c 100755 --- a/src/lib/16_head.h +++ b/src/lib/16_head.h @@ -50,6 +50,8 @@ #include "src/lib/nyan/kitten.h" #include "src/lib/types.h" +#define VERSION __DATE__ " " __TIME__ + /* Control codes for all keys on the keyboard */ //here temperarly /* diff --git a/src/lib/vgmsnd/stdtype.h b/src/lib/vgmsnd/stdtype.h index 7672109d..69dc9bb8 100755 --- a/src/lib/vgmsnd/stdtype.h +++ b/src/lib/vgmsnd/stdtype.h @@ -9,8 +9,8 @@ typedef uint8_t UINT8; typedef int8_t INT8; typedef uint16_t UINT16; typedef int16_t INT16; -typedef signed long UINT32; -typedef unsigned long INT32; +typedef unsigned long UINT32; +typedef signed long INT32; typedef uint64_t UINT64; typedef int64_t INT64; diff --git a/src/lib/vgmsnd/vgmSnd.c b/src/lib/vgmsnd/vgmSnd.c index 508f4609..1bd719f8 100755 --- a/src/lib/vgmsnd/vgmSnd.c +++ b/src/lib/vgmsnd/vgmSnd.c @@ -21,18 +21,18 @@ typedef struct _vgm_file_header_base { - UINT32 fccVGM; // 00 - UINT32 lngEOFOffset; // 04 - UINT32 lngVersion; // 08 - UINT32 lngSkip1[2]; // 0C - UINT32 lngGD3Offset; // 14 - UINT32 lngTotalSamples; // 18 - UINT32 lngLoopOffset; // 1C - UINT32 lngLoopSamples; // 20 - UINT32 lngRate; // 24 - UINT32 lngSkip2[3]; // 28 - UINT32 lngDataOffset; // 34 - UINT32 lngSkip3[2]; // 38 + dword fccVGM; // 00 + dword/*32*/ lngEOFOffset; // 04 + dword/*32*/ lngVersion; // 08 + dword/*32*/ lngSkip1[2]; // 0C + dword/*32*/ lngGD3Offset; // 14 + dword/*32*/ lngTotalSamples; // 18 + dword/*32*/ lngLoopOffset; // 1C + dword/*32*/ lngLoopSamples; // 20 + dword/*32*/ lngRate; // 24 + dword/*32*/ lngSkip2[3]; // 28 + dword/*32*/ lngDataOffset; // 34 + dword/*32*/ lngSkip3[2]; // 38 } VGM_BASE_HDR; #define PBMODE_MUSIC 0x00 @@ -42,9 +42,9 @@ typedef struct _vgm_playback UINT8 pbMode; UINT8 vgmEnd; // 00 - running, 01 - finished, FF - not loaded UINT16 curLoopCnt; - UINT32 vgmPos; - UINT32 vgmSmplPos; - UINT32 pbSmplPos; + dword/*32*/ vgmPos; + dword/*32*/ vgmSmplPos; + dword/*32*/ pbSmplPos; VGM_FILE* file; // oplChnMask: @@ -66,10 +66,10 @@ INLINE UINT16 ReadLE16(const UINT8* buffer) #endif } -INLINE UINT32 ReadLE32(const UINT8* buffer) +INLINE dword/*32*/ ReadLE32(const UINT8* buffer) { #ifdef QUICK_READ - return *(UINT32*)buffer; + return *(dword/*32*/*)buffer; #else return (buffer[0x00] << 0) | (buffer[0x01] << 8) | (buffer[0x02] << 16) | (buffer[0x03] << 24); @@ -144,7 +144,7 @@ UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile) size_t bytesToRead; VGM_BASE_HDR vgmBaseHdr; FILE* hFile; - UINT32 CurPos; + dword/*32*/ CurPos; memset(vgmFile, 0x00, sizeof(VGM_FILE)); @@ -239,14 +239,14 @@ static boolean DoVgmLoop(VGM_PBK* vgmPlay) static void UpdateVGM(VGM_PBK* vgmPlay, UINT16 Samples) { - const UINT32 vgmLen = vgmPlay->file->dataLen; + const dword/*32*/ vgmLen = vgmPlay->file->dataLen; const UINT8* vgmData = vgmPlay->file->data; const UINT8* VGMPnt; - UINT32 VGMPos; - UINT32 VGMSmplPos; + dword/*32*/ VGMPos; + dword/*32*/ VGMSmplPos; UINT8 Command; UINT8 blockType; - UINT32 blockLen; + dword/*32*/ blockLen; vgmPlay->pbSmplPos += Samples; VGMPos = vgmPlay->vgmPos; diff --git a/src/lib/vgmsnd/vgmSnd.h b/src/lib/vgmsnd/vgmSnd.h index e351054c..373d73dd 100755 --- a/src/lib/vgmsnd/vgmSnd.h +++ b/src/lib/vgmsnd/vgmSnd.h @@ -11,36 +11,36 @@ extern "C" typedef struct _vgm_file_header { - UINT32 fccVGM; - UINT32 lngEOFOffset; - UINT32 lngVersion; - UINT32 lngHzPSG; - UINT32 lngHzYM2413; - UINT32 lngGD3Offset; - UINT32 lngTotalSamples; - UINT32 lngLoopOffset; - UINT32 lngLoopSamples; - UINT32 lngRate; + dword/*32*/ fccVGM; + dword/*32*/ lngEOFOffset; + dword/*32*/ lngVersion; + dword/*32*/ lngHzPSG; + dword/*32*/ lngHzYM2413; + dword/*32*/ lngGD3Offset; + dword/*32*/ lngTotalSamples; + dword/*32*/ lngLoopOffset; + dword/*32*/ lngLoopSamples; + dword/*32*/ lngRate; UINT8 bytPSGCfg[4]; - UINT32 lngHzYM2612; - UINT32 lngHzYM2151; - UINT32 lngDataOffset; - UINT32 lngHzSPCM; - UINT32 lngSPCMIntf; - UINT32 lngHzRF5C68; - UINT32 lngHzYM2203; - UINT32 lngHzYM2608; - UINT32 lngHzYM2610; - UINT32 lngHzYM3812; - UINT32 lngHzYM3526; - UINT32 lngHzY8950; - UINT32 lngHzYMF262; - UINT32 lngHzYMF278B; - UINT32 lngHzYMF271; - UINT32 lngHzYMZ280B; - UINT32 lngHzRF5C164; - UINT32 lngHzPWM; - UINT32 lngHzAY8910; + dword/*32*/ lngHzYM2612; + dword/*32*/ lngHzYM2151; + dword/*32*/ lngDataOffset; + dword/*32*/ lngHzSPCM; + dword/*32*/ lngSPCMIntf; + dword/*32*/ lngHzRF5C68; + dword/*32*/ lngHzYM2203; + dword/*32*/ lngHzYM2608; + dword/*32*/ lngHzYM2610; + dword/*32*/ lngHzYM3812; + dword/*32*/ lngHzYM3526; + dword/*32*/ lngHzY8950; + dword/*32*/ lngHzYMF262; + dword/*32*/ lngHzYMF278B; + dword/*32*/ lngHzYMF271; + dword/*32*/ lngHzYMZ280B; + dword/*32*/ lngHzRF5C164; + dword/*32*/ lngHzPWM; + dword/*32*/ lngHzAY8910; UINT8 bytAYCfg[4]; UINT8 bytVolumeModifier; UINT8 bytReserved2; @@ -50,7 +50,7 @@ typedef struct _vgm_file_header typedef struct _vgm_file { - UINT32 dataLen; + dword/*32*/ dataLen; UINT8* data; VGM_HEADER header; } VGM_FILE; @@ -73,8 +73,8 @@ void UpdateSoundEngine(void); // Functions that must be supplied by external library: -//extern void OPL2_Write(UINT8 reg, UINT8 data); -//extern UINT8 OPL2_ReadStatus(void); +extern void OPL2_Write(UINT8 reg, UINT8 data); +extern UINT8 OPL2_ReadStatus(void); #ifdef __cplusplus diff --git a/src/scroll.c b/src/scroll.c index ac0b8fe8..1261b7be 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -370,7 +370,7 @@ void main() VGAmodeX(0, &gvar); IN_Shutdown(); printf("Project 16 scroll.exe. This is just a test file!\n"); - printf("version %s %s\n", __DATE__, __TIME__); + printf("version %s\n", VERSION); printf("tx: %d\n", bg->tx); printf("ty: %d\n", bg->ty); printf("player[0].x: %d", player[0].x); printf(" player[0].y: %d\n", player[0].y); diff --git a/src/vgmtest.c b/src/vgmtest.c index f1893ca6..1f5deeaf 100755 --- a/src/vgmtest.c +++ b/src/vgmtest.c @@ -26,20 +26,20 @@ #include "src/lib/vgmsnd/vgmSnd.h" #include "src/lib/16_snd.h" //#include "src/lib/doslib/adlib.h" -#include "src/lib/16_in.h" +//#include "src/lib/16_in.h" -void OPL2_Write(byte reg, byte data); -byte OPL2_ReadStatus(void); +void OPL2_Write(UINT8 reg, UINT8 data); +UINT8 OPL2_ReadStatus(void); -void OPL2_Write(byte reg, byte data) +void OPL2_Write(UINT8 reg, UINT8 data) { //ym3812_w(0, 0, reg); //ym3812_w(0, 1, data); - opl2out(reg, data); + opl2out((word)reg, (word)data); return; } -byte OPL2_ReadStatus(void) +UINT8 OPL2_ReadStatus(void) { return(inp(ADLIB_FM_ADDRESS)); //return ym3812_r(0, 0); @@ -48,28 +48,27 @@ byte OPL2_ReadStatus(void) void main(int argc, char *argv[]) { - global_game_variables_t gvar; + //global_game_variables_t gvar; VGM_FILE pee[9]; - player_t player[MaxPlayers]; + //player_t player[MaxPlayers]; char *bakapee; bakapee = malloc(64); if(argv[1]) bakapee = argv[1]; else bakapee = "data/0.vgm"; printf("%x\n", OpenVGMFile(bakapee, &pee[0])); - IN_Startup(); - IN_Default(0,&player,ctrl_Joystick); + //IN_Startup(); + //IN_Default(0,&player,ctrl_Joystick); InitEngine(); PlayMusic(&pee[0]); - while(!IN_KeyDown(sc_Escape)) - //while(!getch()) + //while(!IN_KeyDown(sc_Escape)) + while(!kbhit()) { - IN_ReadControl(0,&player); + //IN_ReadControl(0,&player); UpdateSoundEngine(); } StopMusic(); FreeVGMFile(&pee[0]); //IN_Shutdown(); DeinitEngine(); - IN_Shutdown(); } diff --git a/vgmtest.exe b/vgmtest.exe index 073e1cbe..67149a5c 100755 Binary files a/vgmtest.exe and b/vgmtest.exe differ