From: sparky4 Date: Tue, 21 Jul 2015 17:47:36 +0000 (-0500) Subject: EXMMTEST IS CRAZY!!!! X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=8e778b256499f0069dd728da206a7a5ce2099c60;p=16.git EXMMTEST IS CRAZY!!!! 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/exmmtest.c modified: src/lib/16_mm.c modified: src/lib/16_mm.h modified: test.exe modified: test2.exe modified: tsthimem.exe --- diff --git a/16.exe b/16.exe index 8011c296..bcf171f8 100644 Binary files a/16.exe and b/16.exe differ diff --git a/DEBUG.TXT b/DEBUG.TXT index 4505bcdc..e69de29b 100644 --- a/DEBUG.TXT +++ b/DEBUG.TXT @@ -1,7 +0,0 @@ -Seg:0 Size:114016 Owner:0xbc84 -Seg:1bd6 Size:8192 Owner:0x7972 -Seg:2200 Size:8512 Owner:0xb1dc -Seg:2a5e Size:743968 Owner:0x7c00 -Seg:e000 Size:31344 Owner:0x9aa8 - -MM_ShowMemory: Memory block order currupted! diff --git a/MMDUMP.TXT b/MMDUMP.TXT index e69de29b..06b0ee85 100644 --- a/MMDUMP.TXT +++ b/MMDUMP.TXT @@ -0,0 +1,5 @@ +0x004c:0a75 (P€) = 3009 +0x004c:120a (P) = 3009 +0x002d:21e6 (-ä) = 3009 +0x004c:c36b (PÍ) = 3009 +0x004c:fd76 (PÐ) = 3009 diff --git a/exmmtest.exe b/exmmtest.exe index 36037c4f..08892014 100644 Binary files a/exmmtest.exe and b/exmmtest.exe differ diff --git a/fmemtest.exe b/fmemtest.exe index 2af74dea..2a7db548 100644 Binary files a/fmemtest.exe and b/fmemtest.exe differ diff --git a/fontgfx.exe b/fontgfx.exe index 5bacb716..612eaae8 100644 Binary files a/fontgfx.exe and b/fontgfx.exe differ diff --git a/fonttes0.exe b/fonttes0.exe index bcbc9adb..32fe3ed3 100644 Binary files a/fonttes0.exe and b/fonttes0.exe differ diff --git a/fonttest.exe b/fonttest.exe index 53ce74e4..e5d7fa8d 100644 Binary files a/fonttest.exe and b/fonttest.exe differ diff --git a/inputest.exe b/inputest.exe index 21b80803..b20e87ca 100644 Binary files a/inputest.exe and b/inputest.exe differ diff --git a/makefile b/makefile index 6b868df8..5d5f4abc 100644 --- a/makefile +++ b/makefile @@ -13,9 +13,9 @@ TARGET_OS = dos #-zkl = current codepage DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm -CFLAGS=-zk0 -wo -x -mc -zu -k32768#-k48000# -zdp# -zp16 -zq +CFLAGS=-zk0 -wo -x -mc -zu #-k32768#-k16384# -zdp# -zp16 -zq OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+ -FLAGS=-0 -d1 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) #-d2 +FLAGS=-0 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) #-d2 SRC=src$(DIRSEP) SRCLIB=$(SRC)lib$(DIRSEP) JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) @@ -28,8 +28,8 @@ DOSLIBOBJ = adlib.$(OBJ) midi.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OB 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) -all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe exmmtest.exe fonttes0.exe fontgfx.exe sountest.exe miditest.exe tsthimem.exe inputest.exe -#testemm.exe testemm0.exe +all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe exmmtest.exe fontgfx.exe sountest.exe tsthimem.exe inputest.exe +#testemm.exe testemm0.exe fonttes0.exe miditest.exe # #executables diff --git a/maptest.exe b/maptest.exe index d987ca52..8c098e42 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/miditest.exe b/miditest.exe index 57f7442c..c3d26429 100644 Binary files a/miditest.exe and b/miditest.exe differ diff --git a/palettec.exe b/palettec.exe index 0ee68af9..edac065e 100644 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index a42df2be..45e2aede 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/sountest.exe b/sountest.exe index 4ffcff6d..3e85c76e 100644 Binary files a/sountest.exe and b/sountest.exe differ diff --git a/src/exmmtest.c b/src/exmmtest.c index a7a78188..f07fcf36 100644 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -52,15 +52,15 @@ main(int argc, char *argv[]) screen.width += (16*2); screen.height += (16*2); - printf("start!\n"); + printf(" start!\n"); MM_Startup(&mm, &mmi); - printf("done!\n"); + printf(" done!\n"); printf("&main()=%Fp\n", *argv[0]); #ifdef FILEINIT - printf("read\n"); + printf(" read\n"); if(CA_ReadFile(bakapee, &bigbuffer, &mm/*, &mmi*/)) #else - printf("load\n"); + printf(" load\n"); if(CA_LoadFile(bakapee, &bigbuffer, &mm, &mmi)) #endif baka=1; @@ -76,14 +76,14 @@ main(int argc, char *argv[]) modexEnter(); modexShowPage(&screen); MM_ShowMemory(&screen, &mm); - getch(); + //getch(); MM_DumpData(&mm); modexLeave(); MM_Report(&screen, &mm, &mmi); - printf("stop!\n"); + printf(" stop!\n"); MM_FreePtr(&bigbuffer, &mm); MM_Shutdown(&mm); - printf("done!\n"); + printf(" done!\n"); free(bakapee); //printf("_bios_memsize=%u\n", _bios_memsize()); if(baka) printf("\nyay!\n"); diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index fc5238a3..184dc9e8 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -306,7 +306,6 @@ byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi) byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) { - //SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle) //Maps up to 4 logical EMS pages to physical pages in the page frame, where: @@ -343,7 +342,7 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi) { __asm { - mov ax,EMS_MAPXPAGE + mov ah,EMS_MAPXPAGE mov cx,[i] // logical page mov al,bl // physical page mov dx,[EMShandle] // handle @@ -720,10 +719,10 @@ printf(" EMS3\n"); //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT! MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm); printf(" EMS4\n"); - if(mm->EMSVer<0x40) + //if(mm->EMSVer<0x40) MM_MapEMS(mm, mmi); // map in used pages - else - MM_MapXEMS(mm, mmi); // map in used pages + //else + // MM_MapXEMS(mm, mmi); // map in used pages } // @@ -1393,9 +1392,6 @@ void MM_Report(page_t *page, mminfo_t *mm, mminfotype *mmi) 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); - getch(); switch(err) { case 0x0: diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index fb8b79c4..68999521 100644 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -39,9 +39,9 @@ #define SAVENEARHEAP 0x200 // space to leave in data segment #define SAVEFARHEAP 0 // space to leave in far heap -#define BUFFERSIZE 0x2000 // miscelanious, allways available buffer +#define BUFFERSIZE 0x1000 // miscelanious, allways available buffer -#define MAXBLOCKS 600 +#define MAXBLOCKS 640 @@ -54,7 +54,7 @@ #define EMS_GETPAGES 0x42 #define EMS_ALLOCPAGES 0x43 #define EMS_MAPPAGE 0x44 -#define EMS_MAPXPAGE 0x5000 +#define EMS_MAPXPAGE 0x50 #define EMS_FREEPAGES 0x45 #define EMS_VERSION 0x46 diff --git a/test.exe b/test.exe index 39c98354..424e96f7 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index 40de5810..bca481f4 100644 Binary files a/test2.exe and b/test2.exe differ diff --git a/tsthimem.exe b/tsthimem.exe index 9d0f29e2..19118cf6 100644 Binary files a/tsthimem.exe and b/tsthimem.exe differ