From: sparky4 Date: Tue, 13 Oct 2015 19:20:39 +0000 (-0500) Subject: remade X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=5cf6961096efa8f4ecf5171ff46f4bb0e8c9fa41;p=16.git remade --- diff --git a/16.exe b/16.exe index b69736e4..8ab2840e 100755 Binary files a/16.exe and b/16.exe differ diff --git a/16.map b/16.map index 578fab67..87579430 100755 --- a/16.map +++ b/16.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: 16.exe creating a DOS executable @@ -13,7 +13,7 @@ creating a DOS executable Group Address Size ===== ======= ==== -DGROUP 13a3:0000 0000f250 +DGROUP 13a3:0000 0000f240 @@ -45,19 +45,19 @@ _NULL BEGDATA DGROUP 13a3:0000 00000020 _AFTERNULL BEGDATA DGROUP 13a5:0000 00000002 CONST DATA DGROUP 13a5:0002 00000076 CONST2 DATA DGROUP 13ac:0008 00000102 -_DATA DATA DGROUP 13bd:0000 000005d1 -XIB DATA DGROUP 141a:0002 00000000 -XI DATA DGROUP 141a:0002 00000036 -XIE DATA DGROUP 141d:0008 00000000 -YIB DATA DGROUP 141d:0008 00000000 -YI DATA DGROUP 141d:0008 00000018 -YIE DATA DGROUP 141f:0000 00000000 -STRINGS DATA DGROUP 141f:0000 00000000 -DATA DATA DGROUP 141f:0000 00000000 -_emu_init_start EMU DGROUP 141f:0000 00000000 -_emu_init_end EMU DGROUP 141f:0000 00000000 -_BSS BSS DGROUP 141f:0000 00000fc2 -STACK STACK DGROUP 151c:0000 0000dac0 +_DATA DATA DGROUP 13bd:0000 000005c1 +XIB DATA DGROUP 1419:0002 00000000 +XI DATA DGROUP 1419:0002 00000036 +XIE DATA DGROUP 141c:0008 00000000 +YIB DATA DGROUP 141c:0008 00000000 +YI DATA DGROUP 141c:0008 00000018 +YIE DATA DGROUP 141e:0000 00000000 +STRINGS DATA DGROUP 141e:0000 00000000 +DATA DATA DGROUP 141e:0000 00000000 +_emu_init_start EMU DGROUP 141e:0000 00000000 +_emu_init_end EMU DGROUP 141e:0000 00000000 +_BSS BSS DGROUP 141e:0000 00000fc2 +STACK STACK DGROUP 151b:0000 0000dac0 +----------------+ @@ -71,12 +71,12 @@ Address Symbol ======= ====== Module: 16.o(/dos/z/16/src/16.c) -13a3:07c0+ _player -13a3:08c0+ _gvar -13a3:08e8+ _cpus -13a3:08ec* _gpal -13a3:08f0+ _dpal -13a3:08f4+ _engi_stat +13a3:07b0+ _player +13a3:08b0+ _gvar +13a3:08d8+ _cpus +13a3:08dc* _gpal +13a3:08e0+ _dpal +13a3:08e4+ _engi_stat 0000:01f8 main_ Module: mapread.o(/dos/z/16/src/lib/mapread.c) 0000:0538+ jsoneq_ @@ -86,7 +86,7 @@ Module: jsmn.o(/dos/z/16/src/lib/jsmn/jsmn.c) 0000:10e2 jsmn_parse_ 0000:15de jsmn_init_ Module: 16_in.o(/dos/z/16/src/lib/16_in.c) -13a3:091e+ _inpu +13a3:090e+ _inpu 0000:1770+ INL_KeyService_ 0000:1a0a+ Mouse_ 0000:1a62+ IN_GetJoyAbs_ @@ -134,9 +134,9 @@ Module: 16_mm.o(/dos/z/16/src/lib/16_mm.c) 0000:5d3c+ MM_TotalFree_ 0000:5dd2* MM_Report_ 0000:678a* MM_BombOnError_ -13a3:0a80+ _beforesort -13a3:0a84+ _aftersort -13a3:0a88+ _XMSaddr +13a3:0a70+ _beforesort +13a3:0a74+ _aftersort +13a3:0a78+ _XMSaddr Module: wcpu.o(/dos/z/16/src/lib/wcpu/wcpu.c) 0000:67c0 detectcpu_ Module: 16_head.o(/dos/z/16/src/lib/16_head.c) @@ -154,9 +154,9 @@ Module: 16_ca.o(/dos/z/16/src/lib/16_ca.c) 0000:6f00* CAL_OptimizeNodes_ 0000:6fb0* CA_Startup_ 0000:7000* CA_Shutdown_ -13a3:0a90* _finishcachebox -13a3:0a94* _drawcachebox -13a3:0a98* _updatecachebox +13a3:0a80* _finishcachebox +13a3:0a84* _drawcachebox +13a3:0a88* _updatecachebox Module: kitten.o(/dos/z/16/src/lib/nyan/kitten.c) 0000:706c KITTENGETS 0000:70cc* kittenopen_ @@ -238,9 +238,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(printf.c) 0901:0042 printf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart) 13a3:0000* __nullarea -13a3:0506* __ovlflag -13a3:0507* __intno -13a3:0508* __ovlvec +13a3:0504* __ovlflag +13a3:0505* __intno +13a3:0506* __ovlvec 0901:0072 _cstart_ 0901:0145* _Not_Enough_Memory_ 0901:0277 __exit_ @@ -250,10 +250,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmodel.asm) 0901:02fe _big_code_ 0901:02fe* CodeModelMismatch Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(argcv.c) -13a3:13a4 __argv -13a3:13a8 ___argv -13a3:13ac __argc -13a3:13ae ___argc +13a3:1394 __argv +13a3:1398 ___argv +13a3:139c __argc +13a3:139e ___argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm) 0901:0305 __PIA 0901:02fe* __PIS @@ -262,9 +262,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strncmp.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmalloc.c) 0901:0359 _fmalloc_ 0901:0359 malloc_ -13a3:050c ___fheap -13a3:050e ___fheapRover -13a3:0510 ___LargestSizeB4Rover +13a3:050a ___fheap +13a3:050c ___fheapRover +13a3:050e ___LargestSizeB4Rover Module: gfx.lib(/dos/z/16/src/lib/bitmap.c) 0901:a48e bitmapLoadPcx_ 0901:a5ea* bitmapLoadPcxTiles_ @@ -281,11 +281,11 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fread.c) 0901:0b40 fread_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c) 0901:0eb7 __get_errno_ptr_ -13a3:1430 _errno +13a3:1420 _errno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iob.c) -13a3:0524 ___iob -13a3:1432 ___ClosedStreams -13a3:1436 ___OpenStreams +13a3:0514 ___iob +13a3:1422 ___ClosedStreams +13a3:1426 ___OpenStreams Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprintf.c) 0901:0ebe fprintf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(frealloc.c) @@ -316,22 +316,22 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(memavl.c) 0901:1366 _memavl_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmalloc.c) 0901:13ab _nmalloc_ -13a3:068c ___nheapbeg -13a3:068e ___MiniHeapRover -13a3:0690 ___LargestSizeB4MiniHeapRover +13a3:067c ___nheapbeg +13a3:067e ___MiniHeapRover +13a3:0680 ___LargestSizeB4MiniHeapRover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ffree.c) 0901:1485 _ffree_ 0901:1485 free_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nfree.c) 0901:14f2 _nfree_ -13a3:143a+ ___MiniHeapFreeRover +13a3:142a+ ___MiniHeapFreeRover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c) 0901:15ed+ _null_exit_rtn_ 0901:15ed+ __null_int23_exit_ 0901:15ee exit_ 0901:160f+ _exit_ -13a3:0692+ ___int23_exit -13a3:0696 ___FPE_handler_exit +13a3:0682+ ___int23_exit +13a3:0686 ___FPE_handler_exit Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ltoa.c) 0901:162b ultoa_ 0901:16e9* ltoa_ @@ -341,7 +341,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fclose.c) 0901:1a9b __doclose_ 0901:1be5 __shutdown_stream_ 0901:1bff fclose_ -13a3:143c+ ___RmTmpFileFn +13a3:142c+ ___RmTmpFileFn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(clockdos.c) 0901:1c6a+ __ibm_bios_get_ticks_ 0901:1ce1 clock_ @@ -387,31 +387,31 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nheapwal.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stack086.c) 0901:28f7 stackavail_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_8087086.asm) -13a3:06a2 __8087 -13a3:06a3 __real87 -13a3:06a4 __dos87emucall -13a3:06a6 __dos87real +13a3:0692 __8087 +13a3:0693 __real87 +13a3:0694 __dos87emucall +13a3:0696 __dos87real Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c) 0901:2906* __exit_with_msg_ 0901:290b __fatal_runtime_error_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata) -13a3:06a8 __curbrk -13a3:06b0 __STACKLOW -13a3:06b2 __STACKTOP -13a3:06b4 __cbyte -13a3:06b6 __child -13a3:06b8 __no87 -13a3:06c5 ___FPE_handler -13a3:06aa __psp -13a3:06b9 __get_ovl_stack -13a3:06bd __restore_ovl_stack -13a3:06c1 __close_ovl_file -13a3:06c9 __LpCmdLine -13a3:06cd __LpPgmName -13a3:06ac __osmajor -13a3:06ad __osminor -13a3:06ae __osmode -13a3:06af __HShift +13a3:0698 __curbrk +13a3:06a0 __STACKLOW +13a3:06a2 __STACKTOP +13a3:06a4 __cbyte +13a3:06a6 __child +13a3:06a8 __no87 +13a3:06b5 ___FPE_handler +13a3:069a __psp +13a3:06a9 __get_ovl_stack +13a3:06ad __restore_ovl_stack +13a3:06b1 __close_ovl_file +13a3:06b9 __LpCmdLine +13a3:06bd __LpPgmName +13a3:069c __osmajor +13a3:069d __osminor +13a3:069e __osmode +13a3:069f __HShift Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fgetc.c) 0901:292a __fill_buffer_ 0901:2b79 fgetc_ @@ -422,7 +422,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(rand.c) 0901:307b* srand_ Module: gfx.lib(/dos/z/16/src/lib/16text.c) 0901:a7d6* textInit_ -13a3:1444 _romFonts +13a3:1434 _romFonts Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprtf.c) 0901:30b8 __fprtf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmain086.c) @@ -433,7 +433,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c) 0901:32cc __FiniRtns 0901:32cc* __FFiniRtns Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c) -13a3:06d6 ___uselfn +13a3:06c6 ___uselfn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg) 0901:3330 __DOSseg__ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initargv.c) @@ -451,9 +451,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmemneed.c) 0901:3b7c __fmemneed_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(comtflag.c) 0901:3b7f* __set_commode_ -13a3:06d8 __commode +13a3:06c8 __commode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(textmode.c) -13a3:06da __fmode +13a3:06ca __fmode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chktty.c) 0901:3b8b __chktty_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(freefp.c) @@ -500,9 +500,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iomode.c) 0901:4b72 __GetIOMode_ 0901:4ba7 __SetIOMode_nogrow_ -13a3:06f0 ___NFiles -13a3:06f2 ___init_mode -13a3:071a ___io_mode +13a3:06e0 ___NFiles +13a3:06e2 ___init_mode +13a3:070a ___io_mode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_clse.c) 0901:4bdc __close_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(flush.c) @@ -522,9 +522,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(isatt.c) 0901:4ef2 isatty_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(doserrno.c) 0901:4f0e* __get_doserrno_ptr_ -13a3:1460 __doserrno +13a3:1450 __doserrno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(umaskval.c) -13a3:071e ___umaskval +13a3:070e ___umaskval Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(creatdos.c) 0901:4f15 _dos_creat_ 0901:4f39* _dos_creatnew_ @@ -535,9 +535,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stiomode.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(vsprintf.c) 0901:5142 vsprintf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(environ.c) -13a3:1464 ___env_mask -13a3:1468 _environ -13a3:146c* __wenviron +13a3:1454 ___env_mask +13a3:1458 _environ +13a3:145c* __wenviron Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbterm.c) 0901:5184 _mbterm_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbsnextc.c) @@ -558,7 +558,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chk8087.c) 0901:56da __chk8087_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c) 0901:574a __EnterWVIDEO_ -13a3:073e+ ___WD_Present +13a3:072e+ ___WD_Present Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(flushall.c) 0901:576e __flushall_ 0901:5802 flushall_ @@ -571,20 +571,20 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fputc.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(prtf.c) 0901:5a57 __prtf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c) -13a3:1470 ____Argv -13a3:1474 ____Argc +13a3:1460 ____Argv +13a3:1464 ____Argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c) -13a3:0740 __amblksiz +13a3:0730 __amblksiz Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086) -13a3:0772 __Start_XI -13a3:07a8 __End_XI -13a3:07a8 __Start_YI -13a3:07c0 __End_YI +13a3:0762 __Start_XI +13a3:0798 __End_XI +13a3:0798 __Start_YI +13a3:07b0 __End_YI Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(histsplt.c) -13a3:1476 ___historical_splitparms +13a3:1466 ___historical_splitparms Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapen.c) 0901:6bba* _heapenable_ -13a3:0742 ___heap_enabled +13a3:0732 ___heap_enabled Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bfree.c) 0901:6bcb _bfree_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bexpand.c) @@ -600,22 +600,22 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(setenvp.c) 0901:705e __setenvp_ 0901:71ea __freeenvp_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbisdbcs.c) -13a3:0744 ___IsDBCS +13a3:0734 ___IsDBCS Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbislead.c) 0901:7248* _ismbblead_ -13a3:147c ___MBCSIsTable +13a3:146c ___MBCSIsTable Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbinit.c) 0901:72a2 __mbinit_ -13a3:0746 ___MBCodePage +13a3:0736 ___MBCodePage Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbdtoupp.c) 0901:737d _mbdtoupper_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(toupper.c) 0901:738b toupper_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(8087cw.c) -13a3:0748 __8087cw +13a3:0738 __8087cw Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(save8087.c) -13a3:074a ___Save8087 -13a3:074e ___Rest8087 +13a3:073a ___Save8087 +13a3:073e ___Rest8087 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grabfp87.c) 0901:739a __GrabFP87_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ini87086.asm) @@ -629,8 +629,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(itoa.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strupr.c) 0901:7565 strupr_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c) -13a3:0752 ___EFG_printf -13a3:0756* ___EFG_scanf +13a3:0742 ___EFG_printf +13a3:0746* ___EFG_scanf Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(lltoa.c) 0901:75ad ulltoa_ 0901:76ea* lltoa_ @@ -644,7 +644,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpe87.asm) 0901:78e7 __Fini_FPE_handler_ 0901:791e* __FPEHandler Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c) -13a3:0770 ___FPE_int +13a3:0760 ___FPE_int +--------------------+ @@ -660,6 +660,6 @@ gfx.lib +-----------------------+ Stack size: dac0 (56000.) -Memory size: 00022c80 (142464.) +Memory size: 00022c70 (142448.) Entry point address: 0901:0072 -Link time: 00:00.54 +Link time: 00:00.03 diff --git a/bakapi.exe b/bakapi.exe index ce9e1d00..95a748a3 100755 Binary files a/bakapi.exe and b/bakapi.exe differ diff --git a/bakapi.map b/bakapi.map index 279c6e90..0e885825 100755 --- a/bakapi.map +++ b/bakapi.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: bakapi.exe creating a DOS executable @@ -667,4 +667,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00023280 (144000.) Entry point address: 07d5:022c -Link time: 00:00.35 +Link time: 00:00.01 diff --git a/fontgfx.exe b/fontgfx.exe index ccceac33..266070f6 100755 Binary files a/fontgfx.exe and b/fontgfx.exe differ diff --git a/fontgfx.map b/fontgfx.map index 3f98cb86..256e68c6 100755 --- a/fontgfx.map +++ b/fontgfx.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: fontgfx.exe creating a DOS executable @@ -42,17 +42,17 @@ _NULL BEGDATA DGROUP 11a2:0000 00000020 _AFTERNULL BEGDATA DGROUP 11a4:0000 00000002 CONST DATA DGROUP 11a4:0002 00000076 CONST2 DATA DGROUP 11ab:0008 00000102 -_DATA DATA DGROUP 11bc:0000 000009ff -XIB DATA DGROUP 125c:0000 00000000 -XI DATA DGROUP 125c:0000 00000036 -XIE DATA DGROUP 125f:0006 00000000 -YIB DATA DGROUP 125f:0006 00000000 -YI DATA DGROUP 125f:0006 00000018 -YIE DATA DGROUP 1260:000e 00000000 -STRINGS DATA DGROUP 1260:000e 00000000 -DATA DATA DGROUP 1260:000e 00000000 -_emu_init_start EMU DGROUP 1260:000e 00000000 -_emu_init_end EMU DGROUP 1260:000e 00000000 +_DATA DATA DGROUP 11bc:0000 000009fd +XIB DATA DGROUP 125b:000e 00000000 +XI DATA DGROUP 125b:000e 00000036 +XIE DATA DGROUP 125f:0004 00000000 +YIB DATA DGROUP 125f:0004 00000000 +YI DATA DGROUP 125f:0004 00000018 +YIE DATA DGROUP 1260:000c 00000000 +STRINGS DATA DGROUP 1260:000c 00000000 +DATA DATA DGROUP 1260:000c 00000000 +_emu_init_start EMU DGROUP 1260:000c 00000000 +_emu_init_end EMU DGROUP 1260:000c 00000000 _BSS BSS DGROUP 1261:0000 00000e22 STACK STACK DGROUP 1344:0000 0000dac0 @@ -230,9 +230,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sprintf.c) 0000:7cfb sprintf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart) 11a2:0000* __nullarea -11a2:0946* __ovlflag -11a2:0947* __intno -11a2:0948* __ovlvec +11a2:0944* __ovlflag +11a2:0945* __intno +11a2:0946* __ovlvec 0000:7d2a _cstart_ 0000:7dfd* _Not_Enough_Memory_ 0000:7f2f __exit_ @@ -270,15 +270,15 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(memavl.c) 0000:8300 _memavl_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmalloc.c) 0000:8345 _nmalloc_ -11a2:094c ___nheapbeg -11a2:094e ___MiniHeapRover -11a2:0950 ___LargestSizeB4MiniHeapRover +11a2:094a ___nheapbeg +11a2:094c ___MiniHeapRover +11a2:094e ___LargestSizeB4MiniHeapRover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmalloc.c) 0000:841f _fmalloc_ 0000:841f malloc_ -11a2:0952 ___fheap -11a2:0954 ___fheapRover -11a2:0956 ___LargestSizeB4Rover +11a2:0950 ___fheap +11a2:0952 ___fheapRover +11a2:0954 ___LargestSizeB4Rover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ffree.c) 0000:8594 _ffree_ 0000:8594 free_ @@ -290,8 +290,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c) 0000:86fc+ __null_int23_exit_ 0000:86fd exit_ 0000:871e+ _exit_ -11a2:0958+ ___int23_exit -11a2:095c ___FPE_handler_exit +11a2:0956+ ___int23_exit +11a2:095a ___FPE_handler_exit Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ptc.asm) 0000:873a __PTC Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ltoa.c) @@ -354,31 +354,31 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nheapwal.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stack086.c) 0000:9f0f stackavail_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_8087086.asm) -11a2:0968 __8087 -11a2:0969 __real87 -11a2:096a __dos87emucall -11a2:096c __dos87real +11a2:0966 __8087 +11a2:0967 __real87 +11a2:0968 __dos87emucall +11a2:096a __dos87real Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c) 0000:9f1e* __exit_with_msg_ 0000:9f23 __fatal_runtime_error_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata) -11a2:096e __curbrk -11a2:0976 __STACKLOW -11a2:0978 __STACKTOP -11a2:097a __cbyte -11a2:097c __child -11a2:097e __no87 -11a2:098b ___FPE_handler -11a2:0970 __psp -11a2:097f __get_ovl_stack -11a2:0983 __restore_ovl_stack -11a2:0987 __close_ovl_file -11a2:098f __LpCmdLine -11a2:0993 __LpPgmName -11a2:0972 __osmajor -11a2:0973 __osminor -11a2:0974 __osmode -11a2:0975 __HShift +11a2:096c __curbrk +11a2:0974 __STACKLOW +11a2:0976 __STACKTOP +11a2:0978 __cbyte +11a2:097a __child +11a2:097c __no87 +11a2:0989 ___FPE_handler +11a2:096e __psp +11a2:097d __get_ovl_stack +11a2:0981 __restore_ovl_stack +11a2:0985 __close_ovl_file +11a2:098d __LpCmdLine +11a2:0991 __LpPgmName +11a2:0970 __osmajor +11a2:0971 __osminor +11a2:0972 __osmode +11a2:0973 __HShift Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fgetc.c) 0000:9f42+ __fill_buffer_ 0000:a191 fgetc_ @@ -388,7 +388,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(rand.c) 0000:a651 rand_ 0000:a693* srand_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iob.c) -11a2:099c ___iob +11a2:099a ___iob 11a2:16e2 ___ClosedStreams 11a2:16e6 ___OpenStreams Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprtf.c) @@ -403,7 +403,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c) 0000:a93f __FiniRtns 0000:a93f* __FFiniRtns Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c) -11a2:0b04 ___uselfn +11a2:0b02 ___uselfn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg) 0000:a9a4 __DOSseg__ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initargv.c) @@ -443,14 +443,14 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iomode.c) 0000:b53f __GetIOMode_ 0000:b574 __SetIOMode_nogrow_ -11a2:0b1a ___NFiles -11a2:0b1c ___init_mode -11a2:0b44 ___io_mode +11a2:0b18 ___NFiles +11a2:0b1a ___init_mode +11a2:0b42 ___io_mode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(comtflag.c) 0000:b5a9* __set_commode_ -11a2:0b48 __commode +11a2:0b46 __commode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(textmode.c) -11a2:0b4a __fmode +11a2:0b48 __fmode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chktty.c) 0000:b5b5 __chktty_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(freefp.c) @@ -479,7 +479,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(doserrno.c) 0000:bbd8* __get_doserrno_ptr_ 11a2:16f0 __doserrno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(umaskval.c) -11a2:0b4c ___umaskval +11a2:0b4a ___umaskval Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(creatdos.c) 0000:bbdf _dos_creat_ 0000:bc03* _dos_creatnew_ @@ -511,7 +511,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chk8087.c) 0000:c349 __chk8087_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c) 0000:c3b9 __EnterWVIDEO_ -11a2:0b6c+ ___WD_Present +11a2:0b6a+ ___WD_Present Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(flushall.c) 0000:c3dd __flushall_ 0000:c471 flushall_ @@ -536,19 +536,19 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c) 11a2:1700 ____Argv 11a2:1704 ____Argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c) -11a2:0b6e __amblksiz +11a2:0b6c __amblksiz Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086) -11a2:0ba0 __Start_XI -11a2:0bd6 __End_XI -11a2:0bd6 __Start_YI -11a2:0bee __End_YI +11a2:0b9e __Start_XI +11a2:0bd4 __End_XI +11a2:0bd4 __Start_YI +11a2:0bec __End_YI Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(histsplt.c) 11a2:1706 ___historical_splitparms Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dointr) 0000:dc1c _DoINTR_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapen.c) 0000:df95* _heapenable_ -11a2:0b70 ___heap_enabled +11a2:0b6e ___heap_enabled Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sbrk.c) 0000:dfa6* sbrk_ 0000:dfb6 __brk_ @@ -561,22 +561,22 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(setenvp.c) 0000:e11d __setenvp_ 0000:e2a9 __freeenvp_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbisdbcs.c) -11a2:0b72 ___IsDBCS +11a2:0b70 ___IsDBCS Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbislead.c) 0000:e307* _ismbblead_ 11a2:170c ___MBCSIsTable Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbinit.c) 0000:e361 __mbinit_ -11a2:0b74 ___MBCodePage +11a2:0b72 ___MBCodePage Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbdtoupp.c) 0000:e43c _mbdtoupper_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(toupper.c) 0000:e44a toupper_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(8087cw.c) -11a2:0b76 __8087cw +11a2:0b74 __8087cw Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(save8087.c) -11a2:0b78 ___Save8087 -11a2:0b7c ___Rest8087 +11a2:0b76 ___Save8087 +11a2:0b7a ___Rest8087 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grabfp87.c) 0000:e459 __GrabFP87_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ini87086.asm) @@ -590,8 +590,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(itoa.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strupr.c) 0000:e625 strupr_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c) -11a2:0b80 ___EFG_printf -11a2:0b84* ___EFG_scanf +11a2:0b7e ___EFG_printf +11a2:0b82* ___EFG_scanf Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(lltoa.c) 0000:e66d ulltoa_ 0000:e7aa* lltoa_ @@ -618,7 +618,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bfree.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bexpand.c) 0000:f251 _bexpand_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c) -11a2:0b9e ___FPE_int +11a2:0b9c ___FPE_int +--------------------+ @@ -636,4 +636,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00020f00 (134912.) Entry point address: 0000:7d2a -Link time: 00:00.95 +Link time: 00:00.16 diff --git a/fonttest.map b/fonttest.map index ba2dc4e0..febbfa5b 100755 --- a/fonttest.map +++ b/fonttest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: fonttest.exe creating a DOS executable @@ -588,4 +588,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0001d960 (121184.) Entry point address: 0000:7d82 -Link time: 00:00.63 +Link time: 00:00.05 diff --git a/maptest.exe b/maptest.exe index afb890a9..1bbec155 100755 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/maptest.map b/maptest.map index 933d655d..a38d5dec 100755 --- a/maptest.map +++ b/maptest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: maptest.exe creating a DOS executable @@ -13,7 +13,7 @@ creating a DOS executable Group Address Size ===== ======= ==== -DGROUP 139a:0000 0000f110 +DGROUP 139a:0000 0000f100 @@ -45,19 +45,19 @@ _NULL BEGDATA DGROUP 139a:0000 00000020 _AFTERNULL BEGDATA DGROUP 139c:0000 00000002 CONST DATA DGROUP 139c:0002 00000076 CONST2 DATA DGROUP 13a3:0008 00000102 -_DATA DATA DGROUP 13b4:0000 000005c3 -XIB DATA DGROUP 1410:0004 00000000 -XI DATA DGROUP 1410:0004 00000036 -XIE DATA DGROUP 1413:000a 00000000 -YIB DATA DGROUP 1413:000a 00000000 -YI DATA DGROUP 1413:000a 00000018 -YIE DATA DGROUP 1415:0002 00000000 -STRINGS DATA DGROUP 1415:0002 00000000 -DATA DATA DGROUP 1415:0002 00000000 -_emu_init_start EMU DGROUP 1415:0002 00000000 -_emu_init_end EMU DGROUP 1415:0002 00000000 -_BSS BSS DGROUP 1416:0000 00000e82 -STACK STACK DGROUP 14ff:0000 0000dac0 +_DATA DATA DGROUP 13b4:0000 000005c1 +XIB DATA DGROUP 1410:0002 00000000 +XI DATA DGROUP 1410:0002 00000036 +XIE DATA DGROUP 1413:0008 00000000 +YIB DATA DGROUP 1413:0008 00000000 +YI DATA DGROUP 1413:0008 00000018 +YIE DATA DGROUP 1415:0000 00000000 +STRINGS DATA DGROUP 1415:0000 00000000 +DATA DATA DGROUP 1415:0000 00000000 +_emu_init_start EMU DGROUP 1415:0000 00000000 +_emu_init_end EMU DGROUP 1415:0000 00000000 +_BSS BSS DGROUP 1415:0000 00000e82 +STACK STACK DGROUP 14fe:0000 0000dac0 +----------------+ @@ -80,7 +80,7 @@ Module: jsmn.o(/dos/z/16/src/lib/jsmn/jsmn.c) 0000:1052 jsmn_parse_ 0000:154e jsmn_init_ Module: 16_in.o(/dos/z/16/src/lib/16_in.c) -139a:07de+ _inpu +139a:07ce+ _inpu 0000:16e0+ INL_KeyService_ 0000:197a+ Mouse_ 0000:19d2+ IN_GetJoyAbs_ @@ -128,9 +128,9 @@ Module: 16_mm.o(/dos/z/16/src/lib/16_mm.c) 0000:5cac+ MM_TotalFree_ 0000:5d42* MM_Report_ 0000:66fa* MM_BombOnError_ -139a:0940+ _beforesort -139a:0944+ _aftersort -139a:0948+ _XMSaddr +139a:0930+ _beforesort +139a:0934+ _aftersort +139a:0938+ _XMSaddr Module: wcpu.o(/dos/z/16/src/lib/wcpu/wcpu.c) 0000:6730 detectcpu_ Module: 16_head.o(/dos/z/16/src/lib/16_head.c) @@ -148,9 +148,9 @@ Module: 16_ca.o(/dos/z/16/src/lib/16_ca.c) 0000:6e70* CAL_OptimizeNodes_ 0000:6f20* CA_Startup_ 0000:6f70* CA_Shutdown_ -139a:0950* _finishcachebox -139a:0954* _drawcachebox -139a:0958* _updatecachebox +139a:0940* _finishcachebox +139a:0944* _drawcachebox +139a:0948* _updatecachebox Module: kitten.o(/dos/z/16/src/lib/nyan/kitten.c) 0000:6fdc KITTENGETS 0000:703c* kittenopen_ @@ -187,8 +187,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm) 08f8:0025 __STKOVERFLOW_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iob.c) 139a:04c6 ___iob -139a:0964 ___ClosedStreams -139a:0968 ___OpenStreams +139a:0954 ___ClosedStreams +139a:0958 ___OpenStreams Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprintf.c) 08f8:0042 fprintf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart) @@ -205,10 +205,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmodel.asm) 08f8:02fe _big_code_ 08f8:02fe* CodeModelMismatch Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(argcv.c) -139a:096c __argv -139a:0970 ___argv -139a:0974 __argc -139a:0976 ___argc +139a:095c __argv +139a:0960 ___argv +139a:0964 __argc +139a:0966 ___argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm) 08f8:0305 __PIA 08f8:02fe* __PIS @@ -236,7 +236,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fread.c) 08f8:0b40 fread_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c) 08f8:0eb7 __get_errno_ptr_ -139a:09f8 _errno +139a:09e8 _errno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(frealloc.c) 08f8:0ebe* _frealloc_ 08f8:0ebe realloc_ @@ -275,7 +275,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ffree.c) 08f8:1483 free_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nfree.c) 08f8:14f0 _nfree_ -139a:09fa+ ___MiniHeapFreeRover +139a:09ea+ ___MiniHeapFreeRover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c) 08f8:15eb+ _null_exit_rtn_ 08f8:15eb+ __null_int23_exit_ @@ -292,7 +292,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fclose.c) 08f8:1a99 __doclose_ 08f8:1be3 __shutdown_stream_ 08f8:1bfd fclose_ -139a:09fc+ ___RmTmpFileFn +139a:09ec+ ___RmTmpFileFn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(clockdos.c) 08f8:1c68+ __ibm_bios_get_ticks_ 08f8:1cdf clock_ @@ -442,9 +442,9 @@ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 139a:0694+ _VGA Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(comtflag.c) 08f8:39e5* __set_commode_ -139a:06c6 __commode +139a:06c4 __commode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(textmode.c) -139a:06c8 __fmode +139a:06c6 __fmode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chktty.c) 08f8:39f1 __chktty_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(freefp.c) @@ -486,9 +486,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iomode.c) 08f8:4793 __GetIOMode_ 08f8:47c8 __SetIOMode_nogrow_ -139a:06de ___NFiles -139a:06e0 ___init_mode -139a:0708 ___io_mode +139a:06dc ___NFiles +139a:06de ___init_mode +139a:0706 ___io_mode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_clse.c) 08f8:47fd __close_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(flush.c) @@ -508,9 +508,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(isatt.c) 08f8:4b14 isatty_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(doserrno.c) 08f8:4b30* __get_doserrno_ptr_ -139a:1308 __doserrno +139a:12f8 __doserrno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(umaskval.c) -139a:070c ___umaskval +139a:070a ___umaskval Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(creatdos.c) 08f8:4b37 _dos_creat_ 08f8:4b5b* _dos_creatnew_ @@ -521,9 +521,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stiomode.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(vsprintf.c) 08f8:4d64 vsprintf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(environ.c) -139a:130c ___env_mask -139a:1310 _environ -139a:1314* __wenviron +139a:12fc ___env_mask +139a:1300 _environ +139a:1304* __wenviron Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbterm.c) 08f8:4da6 _mbterm_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbsnextc.c) @@ -544,26 +544,26 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chk8087.c) 08f8:52fc __chk8087_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c) 08f8:536c __EnterWVIDEO_ -139a:072c+ ___WD_Present +139a:072a+ ___WD_Present Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fputc.c) 08f8:5390 fputc_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(prtf.c) 08f8:5565 __prtf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c) -139a:1318 ____Argv -139a:131c ____Argc +139a:1308 ____Argv +139a:130c ____Argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c) -139a:072e __amblksiz +139a:072c __amblksiz Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086) -139a:0764 __Start_XI -139a:079a __End_XI -139a:079a __Start_YI -139a:07b2 __End_YI +139a:0762 __Start_XI +139a:0798 __End_XI +139a:0798 __Start_YI +139a:07b0 __End_YI Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(histsplt.c) -139a:131e ___historical_splitparms +139a:130e ___historical_splitparms Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapen.c) 08f8:66c8* _heapenable_ -139a:0730 ___heap_enabled +139a:072e ___heap_enabled Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(flushall.c) 08f8:66d9 __flushall_ 08f8:676d flushall_ @@ -576,7 +576,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(rand.c) 08f8:6b48* srand_ Module: gfx.lib(/dos/z/16/src/lib/16text.c) 08f8:a7d6* textInit_ -139a:1320 _romFonts +139a:1310 _romFonts Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bfree.c) 08f8:6b6b _bfree_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bexpand.c) @@ -594,22 +594,22 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(setenvp.c) 08f8:705e __setenvp_ 08f8:71ea __freeenvp_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbisdbcs.c) -139a:0736 ___IsDBCS +139a:0734 ___IsDBCS Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbislead.c) 08f8:7248* _ismbblead_ -139a:133c ___MBCSIsTable +139a:132c ___MBCSIsTable Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbinit.c) 08f8:72a2 __mbinit_ -139a:0738 ___MBCodePage +139a:0736 ___MBCodePage Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbdtoupp.c) 08f8:737d _mbdtoupper_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(toupper.c) 08f8:738b toupper_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(8087cw.c) -139a:073a __8087cw +139a:0738 __8087cw Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(save8087.c) -139a:073c ___Save8087 -139a:0740 ___Rest8087 +139a:073a ___Save8087 +139a:073e ___Rest8087 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grabfp87.c) 08f8:739a __GrabFP87_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ini87086.asm) @@ -623,8 +623,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(itoa.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strupr.c) 08f8:7565 strupr_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c) -139a:0744 ___EFG_printf -139a:0748* ___EFG_scanf +139a:0742 ___EFG_printf +139a:0746* ___EFG_scanf Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(lltoa.c) 08f8:75ad ulltoa_ 08f8:76ea* lltoa_ @@ -638,7 +638,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpe87.asm) 08f8:78e7 __Fini_FPE_handler_ 08f8:791e* __FPEHandler Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c) -139a:0762 ___FPE_int +139a:0760 ___FPE_int +--------------------+ @@ -654,6 +654,6 @@ gfx.lib +-----------------------+ Stack size: dac0 (56000.) -Memory size: 00022ab0 (142000.) +Memory size: 00022aa0 (141984.) Entry point address: 08f8:0072 -Link time: 00:00.32 +Link time: 00:00.88 diff --git a/palettec.exe b/palettec.exe index ae2e0e45..ebc614b4 100755 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/palettec.map b/palettec.map index 02ae5c8b..e8d745be 100755 --- a/palettec.map +++ b/palettec.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: palettec.exe creating a DOS executable @@ -42,17 +42,17 @@ _NULL BEGDATA DGROUP 1194:0000 00000020 _AFTERNULL BEGDATA DGROUP 1196:0000 00000002 CONST DATA DGROUP 1196:0002 00000076 CONST2 DATA DGROUP 119d:0008 00000102 -_DATA DATA DGROUP 11ae:0000 000005a9 -XIB DATA DGROUP 1208:000a 00000000 -XI DATA DGROUP 1208:000a 00000036 -XIE DATA DGROUP 120c:0000 00000000 -YIB DATA DGROUP 120c:0000 00000000 -YI DATA DGROUP 120c:0000 00000018 -YIE DATA DGROUP 120d:0008 00000000 -STRINGS DATA DGROUP 120d:0008 00000000 -DATA DATA DGROUP 120d:0008 00000000 -_emu_init_start EMU DGROUP 120d:0008 00000000 -_emu_init_end EMU DGROUP 120d:0008 00000000 +_DATA DATA DGROUP 11ae:0000 000005a7 +XIB DATA DGROUP 1208:0008 00000000 +XI DATA DGROUP 1208:0008 00000036 +XIE DATA DGROUP 120b:000e 00000000 +YIB DATA DGROUP 120b:000e 00000000 +YI DATA DGROUP 120b:000e 00000018 +YIE DATA DGROUP 120d:0006 00000000 +STRINGS DATA DGROUP 120d:0006 00000000 +DATA DATA DGROUP 120d:0006 00000000 +_emu_init_start EMU DGROUP 120d:0006 00000000 +_emu_init_end EMU DGROUP 120d:0006 00000000 _BSS BSS DGROUP 120e:0000 00000e22 STACK STACK DGROUP 12f1:0000 0000dac0 @@ -230,9 +230,9 @@ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 1194:04c4+ _VGA Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart) 1194:0000* __nullarea -1194:04f6* __ovlflag -1194:04f7* __intno -1194:04f8* __ovlvec +1194:04f4* __ovlflag +1194:04f5* __intno +1194:04f6* __ovlvec 0000:7d76 _cstart_ 0000:7e49* _Not_Enough_Memory_ 0000:7f7b __exit_ @@ -269,9 +269,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(memavl.c) 0000:835e _memavl_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmalloc.c) 0000:83a3 _nmalloc_ -1194:04fc ___nheapbeg -1194:04fe ___MiniHeapRover -1194:0500 ___LargestSizeB4MiniHeapRover +1194:04fa ___nheapbeg +1194:04fc ___MiniHeapRover +1194:04fe ___LargestSizeB4MiniHeapRover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ffree.c) 0000:847d _ffree_ 0000:847d free_ @@ -283,8 +283,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c) 0000:85e5+ __null_int23_exit_ 0000:85e6 exit_ 0000:8607+ _exit_ -1194:0502+ ___int23_exit -1194:0506 ___FPE_handler_exit +1194:0500+ ___int23_exit +1194:0504 ___FPE_handler_exit Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ptc.asm) 0000:8624 __PTC Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ltoa.c) @@ -349,31 +349,31 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nheapwal.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stack086.c) 0000:9e27 stackavail_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_8087086.asm) -1194:0512 __8087 -1194:0513 __real87 -1194:0514 __dos87emucall -1194:0516 __dos87real +1194:0510 __8087 +1194:0511 __real87 +1194:0512 __dos87emucall +1194:0514 __dos87real Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c) 0000:9e36* __exit_with_msg_ 0000:9e3b __fatal_runtime_error_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata) -1194:0518 __curbrk -1194:0520 __STACKLOW -1194:0522 __STACKTOP -1194:0524 __cbyte -1194:0526 __child -1194:0528 __no87 -1194:0535 ___FPE_handler -1194:051a __psp -1194:0529 __get_ovl_stack -1194:052d __restore_ovl_stack -1194:0531 __close_ovl_file -1194:0539 __LpCmdLine -1194:053d __LpPgmName -1194:051c __osmajor -1194:051d __osminor -1194:051e __osmode -1194:051f __HShift +1194:0516 __curbrk +1194:051e __STACKLOW +1194:0520 __STACKTOP +1194:0522 __cbyte +1194:0524 __child +1194:0526 __no87 +1194:0533 ___FPE_handler +1194:0518 __psp +1194:0527 __get_ovl_stack +1194:052b __restore_ovl_stack +1194:052f __close_ovl_file +1194:0537 __LpCmdLine +1194:053b __LpPgmName +1194:051a __osmajor +1194:051b __osminor +1194:051c __osmode +1194:051d __HShift Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mem.c) 0000:9e60 __MemAllocator 0000:9f2a __MemFree @@ -402,7 +402,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c) 0000:ab24 __FiniRtns 0000:ab24* __FFiniRtns Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c) -1194:0546 ___uselfn +1194:0544 ___uselfn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg) 0000:ab88 __DOSseg__ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initargv.c) @@ -410,7 +410,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initargv.c) 0000:abec+ _getargv_ 0000:af1c __Fini_Argv_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iob.c) -1194:0548 ___iob +1194:0546 ___iob 1194:1296 ___ClosedStreams 1194:129a ___OpenStreams Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprtf.c) @@ -439,14 +439,14 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iomode.c) 0000:b400 __GetIOMode_ 0000:b435 __SetIOMode_nogrow_ -1194:06c4 ___NFiles -1194:06c6 ___init_mode -1194:06ee ___io_mode +1194:06c2 ___NFiles +1194:06c4 ___init_mode +1194:06ec ___io_mode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(comtflag.c) 0000:b46a* __set_commode_ -1194:06f2 __commode +1194:06f0 __commode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(textmode.c) -1194:06f4 __fmode +1194:06f2 __fmode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chktty.c) 0000:b476 __chktty_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(freefp.c) @@ -475,7 +475,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(doserrno.c) 0000:ba9a* __get_doserrno_ptr_ 1194:12a0 __doserrno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(umaskval.c) -1194:06f6 ___umaskval +1194:06f4 ___umaskval Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(creatdos.c) 0000:baa1 _dos_creat_ 0000:bac5* _dos_creatnew_ @@ -509,12 +509,12 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chk8087.c) 0000:c266 __chk8087_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c) 0000:c2d6 __EnterWVIDEO_ -1194:0716+ ___WD_Present +1194:0714+ ___WD_Present Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapen.c) 0000:c2fa* _heapenable_ -1194:0718 ___heap_enabled +1194:0716 ___heap_enabled Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c) -1194:071a __amblksiz +1194:0718 __amblksiz Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(flushall.c) 0000:c30b __flushall_ 0000:c39f flushall_ @@ -532,10 +532,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c) 1194:12b0 ____Argv 1194:12b4 ____Argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086) -1194:074a __Start_XI -1194:0780 __End_XI -1194:0780 __Start_YI -1194:0798 __End_YI +1194:0748 __Start_XI +1194:077e __End_XI +1194:077e __Start_YI +1194:0796 __End_YI Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(histsplt.c) 1194:12b6 ___historical_splitparms Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initfile.c) @@ -559,22 +559,22 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(setenvp.c) 0000:e03a __setenvp_ 0000:e1c6 __freeenvp_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbisdbcs.c) -1194:071c ___IsDBCS +1194:071a ___IsDBCS Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbislead.c) 0000:e224* _ismbblead_ 1194:12bc ___MBCSIsTable Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbinit.c) 0000:e27e __mbinit_ -1194:071e ___MBCodePage +1194:071c ___MBCodePage Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbdtoupp.c) 0000:e359 _mbdtoupper_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(toupper.c) 0000:e367 toupper_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(8087cw.c) -1194:0720 __8087cw +1194:071e __8087cw Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(save8087.c) -1194:0722 ___Save8087 -1194:0726 ___Rest8087 +1194:0720 ___Save8087 +1194:0724 ___Rest8087 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grabfp87.c) 0000:e376 __GrabFP87_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ini87086.asm) @@ -588,8 +588,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(itoa.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strupr.c) 0000:e541 strupr_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c) -1194:072a ___EFG_printf -1194:072e* ___EFG_scanf +1194:0728 ___EFG_printf +1194:072c* ___EFG_scanf Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(lltoa.c) 0000:e589 ulltoa_ 0000:e6c6* lltoa_ @@ -616,7 +616,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bfree.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bexpand.c) 0000:f16d _bexpand_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c) -1194:0748 ___FPE_int +1194:0746 ___FPE_int +--------------------+ @@ -634,4 +634,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 000209d0 (133584.) Entry point address: 0000:7d76 -Link time: 00:00.03 +Link time: 00:00.67 diff --git a/palettel.exe b/palettel.exe index 4f0abee6..522c75e9 100755 Binary files a/palettel.exe and b/palettel.exe differ diff --git a/palettel.map b/palettel.map index 7d455339..96a790b8 100755 --- a/palettel.map +++ b/palettel.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: palettel.exe creating a DOS executable @@ -227,9 +227,9 @@ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmalloc.c) 0000:7c62 _fmalloc_ 0000:7c62 malloc_ -127f:04f6 ___fheap -127f:04f8 ___fheapRover -127f:04fa ___LargestSizeB4Rover +127f:04f4 ___fheap +127f:04f6 ___fheapRover +127f:04f8 ___LargestSizeB4Rover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm) 0000:7ddf __PIA 0000:7dd8* __PIS @@ -654,4 +654,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 000218b0 (137392.) Entry point address: 0000:7e10 -Link time: 00:00.06 +Link time: 00:00.93 diff --git a/pcxtest.exe b/pcxtest.exe index 4c079e9f..ba93074a 100755 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/pcxtest.map b/pcxtest.map index 056160b2..46c52df4 100755 --- a/pcxtest.map +++ b/pcxtest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: pcxtest.exe creating a DOS executable @@ -505,4 +505,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0001a4d0 (107728.) Entry point address: 0000:03c8 -Link time: 00:00.21 +Link time: 00:00.38 diff --git a/pcxtest2.exe b/pcxtest2.exe index 45842002..63a2587c 100755 Binary files a/pcxtest2.exe and b/pcxtest2.exe differ diff --git a/pcxtest2.map b/pcxtest2.map index 41c76823..9ca3a2b0 100755 --- a/pcxtest2.map +++ b/pcxtest2.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: pcxtest2.exe creating a DOS executable @@ -505,4 +505,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0001a4f0 (107760.) Entry point address: 0000:03e8 -Link time: 00:00.25 +Link time: 00:00.89 diff --git a/scroll.exe b/scroll.exe index 9a11c706..4ed1ac0b 100755 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/scroll.map b/scroll.map index a484200f..580446d3 100755 --- a/scroll.map +++ b/scroll.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: scroll.exe creating a DOS executable @@ -754,4 +754,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0002a5f0 (173552.) Entry point address: 09ae:027c -Link time: 00:00.80 +Link time: 00:00.60 diff --git a/src/lib/modex16.c b/src/lib/modex16.c index ea61e718..2defd97d 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -78,7 +78,7 @@ modex__320x240_256__Enter(global_game_variables_t *gv) dword far*ptr=(dword far*)VGA; /* used for faster screen clearing */ word CRTParms[] = { // 0xe300, /* horizontal total */ - 0x4f01, /* horizontal display enable end */ +// 0x4f01, /* horizontal display enable end */ 0x5002, /* */ 0x5404, /* */ 0x8005, /* */ diff --git a/test.exe b/test.exe index 7a394ffa..20891645 100755 Binary files a/test.exe and b/test.exe differ diff --git a/test.map b/test.map index d6bcb2e8..8de3b255 100755 --- a/test.map +++ b/test.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: test.exe creating a DOS executable @@ -33,15 +33,15 @@ _NULL BEGDATA DGROUP 082c:0000 00000020 _AFTERNULL BEGDATA DGROUP 082e:0000 00000002 CONST DATA DGROUP 082e:0002 00000076 CONST2 DATA DGROUP 0835:0008 00000000 -_DATA DATA DGROUP 0836:0000 00000252 -XIB DATA DGROUP 085b:0002 00000000 -XI DATA DGROUP 085b:0002 00000018 -XIE DATA DGROUP 085c:000a 00000000 -YIB DATA DGROUP 085c:000a 00000000 -YI DATA DGROUP 085c:000a 0000000c -YIE DATA DGROUP 085d:0006 00000000 -STRINGS DATA DGROUP 085d:0006 00000000 -DATA DATA DGROUP 085d:0006 00000000 +_DATA DATA DGROUP 0836:0000 00000250 +XIB DATA DGROUP 085b:0000 00000000 +XI DATA DGROUP 085b:0000 00000018 +XIE DATA DGROUP 085c:0008 00000000 +YIB DATA DGROUP 085c:0008 00000000 +YI DATA DGROUP 085c:0008 0000000c +YIE DATA DGROUP 085d:0004 00000000 +STRINGS DATA DGROUP 085d:0004 00000000 +DATA DATA DGROUP 085d:0004 00000000 _BSS BSS DGROUP 085e:0000 00000a5b STACK STACK DGROUP 0904:0000 0000dac0 @@ -107,9 +107,9 @@ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 082c:00b4+ _VGA Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart) 082c:0000* __nullarea -082c:00e6* __ovlflag -082c:00e7* __intno -082c:00e8* __ovlvec +082c:00e4* __ovlflag +082c:00e5* __intno +082c:00e6* __ovlvec 0000:0312 _cstart_ 0000:03e5* _Not_Enough_Memory_ 0000:0517 __exit_ @@ -122,23 +122,23 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c) 0000:059e* __exit_with_msg_ 0000:05a3 __fatal_runtime_error_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata) -082c:00ec __curbrk -082c:00f4 __STACKLOW -082c:00f6 __STACKTOP -082c:00f8 __cbyte -082c:00fa __child -082c:00fc __no87 -082c:0109 ___FPE_handler -082c:00ee __psp -082c:00fd __get_ovl_stack -082c:0101 __restore_ovl_stack -082c:0105 __close_ovl_file -082c:010d __LpCmdLine -082c:0111 __LpPgmName -082c:00f0 __osmajor -082c:00f1 __osminor -082c:00f2 __osmode -082c:00f3 __HShift +082c:00ea __curbrk +082c:00f2 __STACKLOW +082c:00f4 __STACKTOP +082c:00f6 __cbyte +082c:00f8 __child +082c:00fa __no87 +082c:0107 ___FPE_handler +082c:00ec __psp +082c:00fb __get_ovl_stack +082c:00ff __restore_ovl_stack +082c:0103 __close_ovl_file +082c:010b __LpCmdLine +082c:010f __LpPgmName +082c:00ee __osmajor +082c:00ef __osminor +082c:00f0 __osmode +082c:00f1 __HShift Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(intx086.c) 0000:05c2+ int86x_ 0000:0745 int86_ @@ -148,9 +148,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmalloc.c) 0000:0790 _fmalloc_ 0000:0790 malloc_ -082c:0116+ ___fheap -082c:0118 ___fheapRover -082c:011a ___LargestSizeB4Rover +082c:0114+ ___fheap +082c:0116 ___fheapRover +082c:0118 ___LargestSizeB4Rover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(printf.c) 0000:0905 printf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c) @@ -158,8 +158,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c) 0000:0934+ __null_int23_exit_ 0000:0935 exit_ 0000:0956+ _exit_ -082c:011c+ ___int23_exit -082c:0120+ ___FPE_handler_exit +082c:011a+ ___int23_exit +082c:011e+ ___FPE_handler_exit Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fopen.c) 0000:0972+ __open_flags_ 0000:0c33+ _fsopen_ @@ -195,12 +195,12 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c) 0000:18d1 __FiniRtns 0000:18d1* __FFiniRtns Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c) -082c:0128 ___uselfn +082c:0126 ___uselfn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg) 0000:1936 __DOSseg__ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c) 0000:1937 __EnterWVIDEO_ -082c:012a+ ___WD_Present +082c:0128+ ___WD_Present Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(intr.c) 0000:195b intr_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(segread.c) @@ -216,27 +216,27 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmemneed.c) 0000:1e6c __fmemneed_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmalloc.c) 0000:1e6f _nmalloc_ -082c:012c ___nheapbeg -082c:012e ___MiniHeapRover -082c:0130 ___LargestSizeB4MiniHeapRover +082c:012a ___nheapbeg +082c:012c ___MiniHeapRover +082c:012e ___LargestSizeB4MiniHeapRover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapgrow.c) 0000:1f49* _heapgrow_ 0000:1f49* _fheapgrow_ 0000:1f4a _nheapgrow_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iob.c) -082c:0132 ___iob +082c:0130 ___iob 082c:0c64 ___ClosedStreams 082c:0c68 ___OpenStreams Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprtf.c) 0000:1fdc __fprtf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(comtflag.c) 0000:212f* __set_commode_ -082c:029a __commode +082c:0298 __commode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c) 0000:213b* __get_errno_ptr_ 082c:0c6c _errno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(textmode.c) -082c:029c __fmode +082c:029a __fmode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(tolower.c) 0000:2142 tolower_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(open.c) @@ -279,17 +279,17 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c) 082c:0c70 ____Argv 082c:0c74 ____Argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c) -082c:029e __amblksiz +082c:029c __amblksiz Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086) -082c:02f2 __Start_XI -082c:030a __End_XI -082c:030a __Start_YI -082c:0316 __End_YI +082c:02f0 __Start_XI +082c:0308 __End_XI +082c:0308 __Start_YI +082c:0314 __End_YI Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dointr) 0000:325a _DoINTR_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapen.c) 0000:35d3* _heapenable_ -082c:02a0 ___heap_enabled +082c:029e ___heap_enabled Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmemneed.c) 0000:35e4 __nmemneed_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grownear.c) @@ -307,16 +307,16 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(opendos.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iomode.c) 0000:4bc4 __GetIOMode_ 0000:4bf9 __SetIOMode_nogrow_ -082c:02a2 ___NFiles -082c:02a4 ___init_mode -082c:02cc ___io_mode +082c:02a0 ___NFiles +082c:02a2 ___init_mode +082c:02ca ___io_mode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(isatt.c) 0000:4c2e isatty_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(doserrno.c) 0000:4c4a* __get_doserrno_ptr_ 082c:0c76 __doserrno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(umaskval.c) -082c:02d0 ___umaskval +082c:02ce ___umaskval Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(creatdos.c) 0000:4c51 _dos_creat_ 0000:4c75* _dos_creatnew_ @@ -348,10 +348,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(itoa.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strupr.c) 0000:510a strupr_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c) -082c:02e6 ___EFG_printf -082c:02ea* ___EFG_scanf +082c:02e4 ___EFG_printf +082c:02e8* ___EFG_scanf Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbisdbcs.c) -082c:02ee ___IsDBCS +082c:02ec ___IsDBCS Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbislead.c) 0000:5152* _ismbblead_ 082c:0c7a ___MBCSIsTable @@ -377,7 +377,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(alphabet.c) 082c:0072 ___Alphabet Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbinit.c) 0000:55f7 __mbinit_ -082c:02f0+ ___MBCodePage +082c:02ee+ ___MBCodePage Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmsize.c) 0000:56d2* _msize_ 0000:56ed _fmsize_ @@ -408,4 +408,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00016b00 (92928.) Entry point address: 0000:0312 -Link time: 00:00.39 +Link time: 00:00.64 diff --git a/test2.exe b/test2.exe index fb5c835f..f9ca8c01 100755 Binary files a/test2.exe and b/test2.exe differ diff --git a/test2.map b/test2.map index 2e8379bd..5c50dd89 100755 --- a/test2.map +++ b/test2.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-bit) Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 15/10/13 14:16:45 +Created on: 15/10/13 14:20:39 Executable Image: test2.exe creating a DOS executable @@ -13,7 +13,7 @@ creating a DOS executable Group Address Size ===== ======= ==== -DGROUP 08f8:0000 0000e8b0 +DGROUP 08f8:0000 0000e8a0 @@ -35,17 +35,17 @@ _NULL BEGDATA DGROUP 08f8:0000 00000020 _AFTERNULL BEGDATA DGROUP 08fa:0000 00000002 CONST DATA DGROUP 08fa:0002 00000076 CONST2 DATA DGROUP 0901:0008 00000000 -_DATA DATA DGROUP 0902:0000 0000026a -XIB DATA DGROUP 0928:000a 00000000 -XI DATA DGROUP 0928:000a 00000018 -XIE DATA DGROUP 092a:0002 00000000 -YIB DATA DGROUP 092a:0002 00000000 -YI DATA DGROUP 092a:0002 0000000c -YIE DATA DGROUP 092a:000e 00000000 -STRINGS DATA DGROUP 092a:000e 00000000 -DATA DATA DGROUP 092a:000e 00000000 -_BSS BSS DGROUP 092a:000e 00000ab3 -STACK STACK DGROUP 09d7:0000 0000dac0 +_DATA DATA DGROUP 0902:0000 00000268 +XIB DATA DGROUP 0928:0008 00000000 +XI DATA DGROUP 0928:0008 00000018 +XIE DATA DGROUP 092a:0000 00000000 +YIB DATA DGROUP 092a:0000 00000000 +YI DATA DGROUP 092a:0000 0000000c +YIE DATA DGROUP 092a:000c 00000000 +STRINGS DATA DGROUP 092a:000c 00000000 +DATA DATA DGROUP 092a:000c 00000000 +_BSS BSS DGROUP 092a:000c 00000ab3 +STACK STACK DGROUP 09d6:0000 0000dac0 +----------------+ @@ -115,7 +115,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fclose.c) 0000:0927 __doclose_ 0000:0a71 __shutdown_stream_ 0000:0a8b fclose_ -08f8:03ae+ ___RmTmpFileFn +08f8:03ac+ ___RmTmpFileFn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c) 0000:0af6+ _null_exit_rtn_ 0000:0af6+ __null_int23_exit_ @@ -179,13 +179,13 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fopen.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmalloc.c) 0000:16b5 _fmalloc_ 0000:16b5 malloc_ -08f8:0136+ ___fheap -08f8:0138 ___fheapRover -08f8:013a ___LargestSizeB4Rover +08f8:0134+ ___fheap +08f8:0136 ___fheapRover +08f8:0138 ___LargestSizeB4Rover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iob.c) -08f8:013c ___iob -08f8:0cb2 ___ClosedStreams -08f8:0cb6 ___OpenStreams +08f8:013a ___iob +08f8:0cb0 ___ClosedStreams +08f8:0cb4 ___OpenStreams Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprintf.c) 0000:182a fprintf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ffree.c) @@ -201,15 +201,15 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c) 0000:1af4 __FiniRtns 0000:1af4* __FFiniRtns Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c) -08f8:02a4 ___uselfn +08f8:02a2 ___uselfn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg) 0000:1b58 __DOSseg__ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c) 0000:1b59 __EnterWVIDEO_ -08f8:02a6+ ___WD_Present +08f8:02a4+ ___WD_Present Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c) 0000:1b7d* __get_errno_ptr_ -08f8:0cba _errno +08f8:0cb8 _errno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ioalloc.c) 0000:1b84 __ioalloc_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(qread.c) @@ -249,12 +249,12 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(i4m.asm) 0000:27b8 __U4M Module: gfx.lib(/dos/z/16/src/lib/16text.c) 0000:8ee6* textInit_ -08f8:0cbc _romFonts +08f8:0cba _romFonts Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(comtflag.c) 0000:27d0* __set_commode_ -08f8:02ac __commode +08f8:02aa __commode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(textmode.c) -08f8:02ae __fmode +08f8:02ac __fmode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(tolower.c) 0000:27dc tolower_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(open.c) @@ -275,9 +275,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmemneed.c) 0000:310c __fmemneed_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmalloc.c) 0000:310f _nmalloc_ -08f8:02b0 ___nheapbeg -08f8:02b2 ___MiniHeapRover -08f8:02b4 ___LargestSizeB4MiniHeapRover +08f8:02ae ___nheapbeg +08f8:02b0 ___MiniHeapRover +08f8:02b2 ___LargestSizeB4MiniHeapRover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapgrow.c) 0000:31e9* _heapgrow_ 0000:31e9* _fheapgrow_ @@ -289,21 +289,21 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ioexit.c) 0000:349d __full_io_exit_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nfree.c) 0000:34a7 _nfree_ -08f8:0cd4+ ___MiniHeapFreeRover +08f8:0cd2+ ___MiniHeapFreeRover Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fputc.c) 0000:35a2 fputc_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(prtf.c) 0000:3777 __prtf_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c) -08f8:0cd6 ____Argv -08f8:0cda ____Argc +08f8:0cd4 ____Argv +08f8:0cd8 ____Argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c) -08f8:02b6 __amblksiz +08f8:02b4 __amblksiz Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086) -08f8:030a __Start_XI -08f8:0322 __End_XI -08f8:0322 __Start_YI -08f8:032e __End_YI +08f8:0308 __Start_XI +08f8:0320 __End_XI +08f8:0320 __Start_YI +08f8:032c __End_YI Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c) 0000:48da* __dosretax 0000:48df* __dosret0 @@ -312,9 +312,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iomode.c) 0000:4959 __GetIOMode_ 0000:498e __SetIOMode_nogrow_ -08f8:02cc ___NFiles -08f8:02ce ___init_mode -08f8:02f6 ___io_mode +08f8:02ca ___NFiles +08f8:02cc ___init_mode +08f8:02f4 ___io_mode Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(qwrit.c) 0000:49c3 __qwrite_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fsync.c) @@ -333,15 +333,15 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(isatt.c) 0000:4c97 isatty_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(doserrno.c) 0000:4cb3* __get_doserrno_ptr_ -08f8:0cde __doserrno +08f8:0cdc __doserrno Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(umaskval.c) -08f8:02fa ___umaskval +08f8:02f8 ___umaskval Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(creatdos.c) 0000:4cba _dos_creat_ 0000:4cde* _dos_creatnew_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapen.c) 0000:4cff* _heapenable_ -08f8:02fc ___heap_enabled +08f8:02fa ___heap_enabled Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmemneed.c) 0000:4d10 __nmemneed_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grownear.c) @@ -355,13 +355,13 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(itoa.c) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strupr.c) 0000:5059 strupr_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c) -08f8:02fe ___EFG_printf -08f8:0302* ___EFG_scanf +08f8:02fc ___EFG_printf +08f8:0300* ___EFG_scanf Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbisdbcs.c) -08f8:0306 ___IsDBCS +08f8:0304 ___IsDBCS Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbislead.c) 0000:50a1* _ismbblead_ -08f8:0ce0 ___MBCSIsTable +08f8:0cde ___MBCSIsTable Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(lltoa.c) 0000:50bd ulltoa_ 0000:51fa* lltoa_ @@ -389,7 +389,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(alphabet.c) 08f8:0072 ___Alphabet Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbinit.c) 0000:5938 __mbinit_ -08f8:0308+ ___MBCodePage +08f8:0306+ ___MBCodePage Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmsize.c) 0000:5a13* _msize_ 0000:5a2e _fmsize_ @@ -418,6 +418,6 @@ gfx.lib +-----------------------+ Stack size: dac0 (56000.) -Memory size: 00017830 (96304.) +Memory size: 00017820 (96288.) Entry point address: 0000:0300 -Link time: 00:00.93 +Link time: 00:00.60