From 0b144a0907c57f35e5d7ce1f1293afa802bb65cc Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sat, 12 Sep 2015 21:59:26 -0500 Subject: [PATCH] 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 --- bcexmm.prj | Bin 7047 -> 7047 bytes exmmtest.map | 4 +- makefile | 25 +- scroll.exe | Bin 56776 -> 56760 bytes scroll.map | 786 +++++++++++++++++++-------------------- src/lib/16_head.h | 2 + src/lib/vgmsnd/stdtype.h | 4 +- src/lib/vgmsnd/vgmSnd.c | 44 +-- src/lib/vgmsnd/vgmSnd.h | 64 ++-- src/scroll.c | 2 +- src/vgmtest.c | 27 +- vgmtest.exe | Bin 29754 -> 21430 bytes 12 files changed, 485 insertions(+), 473 deletions(-) diff --git a/bcexmm.prj b/bcexmm.prj index 89bd32acce132e545649fb3d36dfcae72f9c8003..82bf102efe6cf679cf42fe16de28619a69fff2f5 100755 GIT binary patch delta 115 zcmZoSZ#Umi!@3Sy(uW z>8|AFdf^~O=JnC?ldp(0f$3S|`IAqG+Jo6#VyB>V?qnD7U=VxrEb(NphE0;~OaNB_ BC+h$J 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 0777cd16491c06794a678e5b5ed2c75060316965..6e73d98e301eae4ecea41068c13cf9ad0664eb86 100755 GIT binary patch delta 7314 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 Yh?X%e^mrEj2Zk^|Zb5YJswCt;0AXEWj{pDw delta 7334 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 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 073e1cbedc17b021a9247b51cd8b73dad220cd53..67149a5c0eef19aa77900c05d32bb822dbfde94d 100755 GIT binary patch delta 8670 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 AjQ{`u delta 16596 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 VVID_#F^=EY;qTr_D86AQ{|{N1<7)r_ -- 2.39.5