almost~

	modified:   .gitignore
	modified:   Project 16.bfproject
	modified:   emmtest.exe
	new file:   emsdump.exe
	deleted:    fartest.exe
	modified:   fmemtest.exe
	modified:   makefile
	modified:   makefile~
	modified:   maptest.exe
	modified:   maptest0.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	renamed:    src/fartest.c -> src/emsdump.c
	modified:   test.exe
	modified:   test2.exe

diff --git a/.gitignore b/.gitignore
index 54a1f6db8e74ad036891c06c22791e8365f8354e..8960afa1b2511e1ae1835a81ab199fff2926ad61 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 FUCK\r
 *.err\r
 *.ERR\r
+makefile~\r
 !boop.sh\r
 img\r
 !.git/config\r

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 737dcb9bf8d0e50efb63f902dfecb14aca0f50ae..0b00c5af1f48c7495023fa114b1b4e08d987151a 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -4,9 +4,9 @@ openfiles: /dos/z/16/doc/project.txt:138:0:0:
 openfiles: /dos/z/16/src/palettec.c:179:0:0:
 openfiles: /dos/z/16/src/pcxtest.c:1431:2127:0:
 openfiles: /dos/z/16/src/scroll.c:3841:2952:0:
-openfiles: /dos/z/16/src/fmemtest.c:415:0:0:
+openfiles: /dos/z/16/src/fmemtest.c:150:0:0:
 openfiles: /dos/z/16/src/emmtest.c:732:160:0:
-openfiles: /dos/z/16/src/fartest.c:948:0:0:
+openfiles: /dos/z/16/src/emsdump.c:456:0:0:
 openfiles: /dos/z/16/src/maptest.c:69:0:0:
 openfiles: /dos/z/16/src/maptest0.c:253:85:0:
 openfiles: /dos/z/16/src/test.c:0:0:0:
@@ -23,11 +23,11 @@ openfiles: /dos/z/16/src/lib/mapread.c:4790:4435:0:
 openfiles: /dos/z/16/src/lib/mapread.h:285:23:0:
 openfiles: /dos/z/16/src/lib/jsmn/jsmn.c:4073:3697:0:
 openfiles: /dos/z/16/src/lib/jsmn/jsmn.h:1635:826:0:
-openfiles: /dos/z/16/src/lib/exmm/memory.c:496:0:1:
+openfiles: /dos/z/16/src/lib/exmm/memory.c:496:0:0:
 openfiles: /dos/z/16/src/lib/exmm/memory.h:0:0:0:
 openfiles: /dos/z/16/src/lib/exmm/emmsize.h:0:0:0:
 openfiles: /dos/z/16/src/lib/exmm/emmret.h:0:0:0:
-openfiles: /dos/z/16/makefile:143:0:0:
+openfiles: /dos/z/16/makefile:2267:2340:1:
 openfiles: /dos/z/16/src/lib/types.h:165:0:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0

diff --git a/emmtest.exe b/emmtest.exe
index 8b137891791fe96927ad78e64b0aad7bded08bdc..508418b4b2e7d3ce94796c4b4954b519fd320197 100644 (file)
Binary files a/emmtest.exe and b/emmtest.exe differ

diff --git a/emsdump.exe b/emsdump.exe
new file mode 100644 (file)
index 0000000..fda5ffd
Binary files /dev/null and b/emsdump.exe differ

diff --git a/fartest.exe b/fartest.exe
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/fartest.exe
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/fmemtest.exe b/fmemtest.exe
index 8b137891791fe96927ad78e64b0aad7bded08bdc..b50e3f3d706dc23a200e80d34cc19e5400c1f032 100644 (file)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/makefile b/makefile
index 91b877f5407cd12938b70c02cecd0c4efd8687e0..0e4f6711342cad597706665e2964865439dbcf5c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -12,7 +12,7 @@ SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)\r
 \r
-all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe fartest.exe emmtest.exe fmemtest.exe\r
+all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe\r
 
 #
 #executables
@@ -39,8 +39,11 @@ maptest0.exe: maptest0.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.
 emmtest.exe: emmtest.obj memory.obj
        wcl $(FLAGS) emmtest.obj memory.obj
 
-fartest.exe: fartest.obj memory.obj
-       wcl $(FLAGS) fartest.obj memory.obj
+emsdump.exe: emsdump.obj memory.obj
+       wcl $(FLAGS) emsdump.obj memory.obj
+
+fmemtest.exe: fmemtest.obj# memory.obj
+       wcl $(FLAGS) fmemtest.obj# memory.obj
 
 #
 #executable's objects
@@ -63,8 +66,8 @@ maptest0.obj: $(SRC)maptest0.c $(SRCLIB)modex16.h
 emmtest.obj: $(SRC)emmtest.c\r
        wcl $(FLAGS) -c $(SRC)emmtest.c\r
 
-fartest.obj: $(SRC)fartest.c\r
-       wcl $(FLAGS) -c $(SRC)fartest.c
+emsdump.obj: $(SRC)emsdump.c\r
+       wcl $(FLAGS) -c $(SRC)emsdump.c
 
 fmemtest.obj: $(SRC)fmemtest.c\r
        wcl $(FLAGS) -c $(SRC)fmemtest.c

diff --git a/makefile~ b/makefile~
index 024480cfd22ecf6d02ffaede231240778868d031..9e5492d9f3713b5d898ad9230ce52b3d5b2ec53e 100644 (file)
--- a/makefile~
+++ b/makefile~
@@ -12,8 +12,11 @@ SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)\r
 \r
-all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe fartest.exe emmtest.exe\r
-\r
+all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe fartest.exe emmtest.exe fmemtest.exe\r
+
+#
+#executables
+#\r
 scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj\r
        wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj# 16/lib/x/modex.lib\r
 scroll.obj: $(SRC)scroll.c\r
@@ -39,7 +42,12 @@ emmtest.exe: emmtest.obj memory.obj
 fartest.exe: fartest.obj memory.obj
        wcl $(FLAGS) fartest.obj memory.obj
 
-\r
+fmemtest.exe: fmemtest.obj# memory.obj
+       wcl $(FLAGS) fmemtest.obj# memory.obj
+
+#
+#executable's objects
+#\r
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test.c\r
 \r
@@ -61,7 +69,12 @@ emmtest.obj: $(SRC)emmtest.c
 fartest.obj: $(SRC)fartest.c\r
        wcl $(FLAGS) -c $(SRC)fartest.c
 
-\r
+fmemtest.obj: $(SRC)fmemtest.c\r
+       wcl $(FLAGS) -c $(SRC)fmemtest.c
+
+#
+#non executable objects libraries
+#\r
 modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
 \r
@@ -85,7 +98,10 @@ jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 
 memory.obj: $(EXMMLIB)memory.h $(EXMMLIB)memory.c\r
        wcl $(FLAGS) -c $(EXMMLIB)memory.c
-\r
+
+#
+#other~
+#\r
 clean: .symbolic\r
 #      @$(REMOVECOMMAND) *.obj\r
        @$(REMOVECOMMAND) *.OBJ\r

diff --git a/maptest.exe b/maptest.exe
index 8b137891791fe96927ad78e64b0aad7bded08bdc..4bd8da1288a565a0392d09dcc712488dfe3a808e 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/maptest0.exe b/maptest0.exe
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0930c208e03876bf256a74908edd2f3b2f8f1557 100644 (file)
Binary files a/maptest0.exe and b/maptest0.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 8b137891791fe96927ad78e64b0aad7bded08bdc..29b668ff08b66073c2fad2e1c1e3c498581c2303 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 8b137891791fe96927ad78e64b0aad7bded08bdc..a72bd9b530190810460b58126a0fe59c27a0ce1e 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/fartest.c b/src/emsdump.c
similarity index 100%
rename from src/fartest.c
rename to src/emsdump.c

diff --git a/test.exe b/test.exe
index 8b137891791fe96927ad78e64b0aad7bded08bdc..18da51ec816c7657e9daeecb027bf24a49ba7ac8 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 8b137891791fe96927ad78e64b0aad7bded08bdc..19d9b64ddcc747cfe98581be68bae8a422dfbd2f 100644 (file)
Binary files a/test2.exe and b/test2.exe differ