From: sparky4 Date: Tue, 21 Jul 2015 17:15:33 +0000 (-0500) Subject: pew pew boom X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=12aaf3aedda737dd454e62e2bd96594afe63e156;p=16.git pew pew boom modified: 16.exe modified: DEBUG.TXT modified: MMDUMP.TXT modified: exmmtest.exe modified: fmemtest.exe modified: fontgfx.exe modified: fonttes0.exe modified: fonttest.exe modified: inputest.exe modified: makefile modified: maptest.exe modified: miditest.exe modified: palettec.exe modified: pcxtest.exe modified: sountest.exe modified: src/lib/16_mm.c modified: test.exe modified: test2.exe modified: tsthimem.exe --- diff --git a/16.exe b/16.exe index 06506b05..8011c296 100644 Binary files a/16.exe and b/16.exe differ diff --git a/DEBUG.TXT b/DEBUG.TXT index b442a8f8..a9cdbe7a 100644 --- a/DEBUG.TXT +++ b/DEBUG.TXT @@ -1,7 +1,5 @@ -Seg:0 Size:114096 Owner:0xfd10 -Seg:1bdb Size:4096 Owner:0xb512 -Seg:1e4b Size:8512 Owner:0x8ebc -Seg:22ef Size:774416 Owner:0x8e2e -Seg:e000 Size:31344 Owner:0xd648 - -MM_ShowMemory: Memory block order currupted! +Seg:0 Size:143152 Owner:0x9a50 +Seg:22f3 Size:4096 Owner:0x97a0 +Seg:2560 Size:544 Owner:0x90c7 +Seg:280f Size:753424 Owner:0x70bc +Seg:e000 Size:131056 Owner:0x8d03 diff --git a/MMDUMP.TXT b/MMDUMP.TXT index e69de29b..b5a1baa0 100644 Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ diff --git a/exmmtest.exe b/exmmtest.exe index d110a3fb..84a2e387 100644 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/fmemtest.exe b/fmemtest.exe index d9ccddbf..2af74dea 100644 Binary files a/fmemtest.exe and b/fmemtest.exe differ diff --git a/fontgfx.exe b/fontgfx.exe index 3dd39f38..5bacb716 100644 Binary files a/fontgfx.exe and b/fontgfx.exe differ diff --git a/fonttes0.exe b/fonttes0.exe index ae601be3..bcbc9adb 100644 Binary files a/fonttes0.exe and b/fonttes0.exe differ diff --git a/fonttest.exe b/fonttest.exe index 1e5af570..53ce74e4 100644 Binary files a/fonttest.exe and b/fonttest.exe differ diff --git a/inputest.exe b/inputest.exe index 5824e8ee..21b80803 100644 Binary files a/inputest.exe and b/inputest.exe differ diff --git a/makefile b/makefile index 1c56ca55..6b868df8 100644 --- a/makefile +++ b/makefile @@ -13,7 +13,7 @@ TARGET_OS = dos #-zkl = current codepage DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm -CFLAGS=-zk0 -wo -x -mc -zu -k48000# -zdp# -zp16 -zq +CFLAGS=-zk0 -wo -x -mc -zu -k32768#-k48000# -zdp# -zp16 -zq OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+ FLAGS=-0 -d1 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) #-d2 SRC=src$(DIRSEP) diff --git a/maptest.exe b/maptest.exe index 80f3a40b..d987ca52 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/miditest.exe b/miditest.exe index 55eb2bf2..57f7442c 100644 Binary files a/miditest.exe and b/miditest.exe differ diff --git a/palettec.exe b/palettec.exe index 376d8f46..0ee68af9 100644 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index 115a7fa6..a42df2be 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/sountest.exe b/sountest.exe index a4171579..4ffcff6d 100644 Binary files a/sountest.exe and b/sountest.exe differ diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index a51e7d44..38449a14 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -1394,88 +1394,88 @@ void MM_EMSerr(byte *stri, byte err) { //Returns a text string describing the error code in EMS.Error. fprintf(stderr, "\n%x\n\n", err); + fprintf(stderr, "\n%u\n\n", err); switch(err) { - case '0h': + case 0x0: strcat(stri, "successful"); - case '80h': + case 0x80: strcat(stri, "internal error"); - case '81h': + case 0x81: strcat(stri, "hardware malfunction"); - case '82h': + case 0x82: strcat(stri, "busy .. retry later"); - case '83h': + case 0x83: strcat(stri, "invalid handle"); - case '84h': + case 0x84: strcat(stri, "undefined function requested by application"); - case '85h': + case 0x85: strcat(stri, "no more handles available"); - case '86h': + case 0x86: strcat(stri, "error in save or restore of mapping context"); - case '87h': + case 0x87: strcat(stri, "insufficient memory pages in system"); - case '88h': + case 0x88: strcat(stri, "insufficient memory pages available"); - case '89h': + case 0x89: strcat(stri, "zero pages requested"); - case '8Ah': + case 0x8A: strcat(stri, "invalid logical page number encountered"); - case '8Bh': + case 0x8B: strcat(stri, "invalid physical page number encountered"); - case '8Ch': + case 0x8C: strcat(stri, "page-mapping hardware state save area is full"); - case '8Dh': + case 0x8D: strcat(stri, "save of mapping context failed"); - case '8Eh': + case 0x8E: strcat(stri, "restore of mapping context failed"); - case '8Fh': + case 0x8F: strcat(stri, "undefined subfunction"); - case '90h': + case 0x90: strcat(stri, "undefined attribute type"); - case '91h': + case 0x91: strcat(stri, "feature not supported"); - case '92h': + case 0x92: strcat(stri, "successful, but a portion of the source region has been overwritten"); - case '93h': + case 0x93: strcat(stri, "length of source or destination region exceeds length of region allocated to either source or destination handle"); - case '94h': + case 0x94: strcat(stri, "conventional and expanded memory regions overlap"); - case '95h': + case 0x95: strcat(stri, "offset within logical page exceeds size of logical page"); - case '96h': + case 0x96: strcat(stri, "region length exceeds 1 MB"); - case '97h': + case 0x97: strcat(stri, "source and destination EMS regions have same handle and overlap"); - case '98h': + case 0x98: strcat(stri, "memory source or destination type undefined"); - case '9Ah': + case 0x9A: strcat(stri, "specified alternate map register or DMA register set not supported"); - case '9Bh': + case 0x9B: strcat(stri, "all alternate map register or DMA register sets currently allocated"); - case '9Ch': + case 0x9C: strcat(stri, "alternate map register or DMA register sets not supported"); - case '9Dh': + case 0x9D: strcat(stri, "undefined or unallocated alternate map register or DMA register set"); - case '9Eh': + case 0x9E: strcat(stri, "dedicated DMA channels not supported"); - case '9Fh': + case 0x9F: strcat(stri, "specified dedicated DMA channel not supported"); - case 'A0h': + case 0xA0: strcat(stri, "no such handle name"); - case 'A1h': + case 0xA1: strcat(stri, "a handle found had no name, or duplicate handle name"); - case 'A2h': + case 0xA2: strcat(stri, "attempted to wrap around 1M conventional address space"); - case 'A3h': + case 0xA3: strcat(stri, "source array corrupted"); - case 'A4h': + case 0xA4: strcat(stri, "operating system denied access"); default: strcat(stri, "undefined error"); } } - //========================================================================== /* diff --git a/test.exe b/test.exe index 9ab02f96..39c98354 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index 65ee9440..40de5810 100644 Binary files a/test2.exe and b/test2.exe differ diff --git a/tsthimem.exe b/tsthimem.exe index bb81bf53..9d0f29e2 100644 Binary files a/tsthimem.exe and b/tsthimem.exe differ