farmemory test executables added to makefile~

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

diff --git a/16/dongs.c b/16/dongs.c
deleted file mode 100644 (file)
index 85c9dd4..0000000
--- a/16/dongs.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2015 sparky4
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#include <stdio.h>
-
-void
-main(int argc, char *argv[])
-{
-       long huge *dongs[1337];
-       long huge dong[420];
-       fprintf(stdout, "argv[0]=%Fp\n", argv[0]);
-       fprintf(stdout, "dongs=%Fp\n", dongs[0]);
-       fprintf(stdout, "dong=%Fp\n", &dong[0]);
-       //fprintf(stdout, "%d\n", sizeof(dongs));
-}

diff --git a/16/dongs.exe b/16/dongs.exe
deleted file mode 100644 (file)
index 47eb7a8..0000000
Binary files a/16/dongs.exe and /dev/null differ

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 0f65b2e9a7676d9fc50b563ab4a28b746e1508a4..737dcb9bf8d0e50efb63f902dfecb14aca0f50ae 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -1,16 +1,17 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
-openfiles: /dos/z/16/doc/project.txt:138:0:1:
+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:504: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/emmtest.c:493:554:0:
-openfiles: /dos/z/16/src/far.c:126:0:0:
+openfiles: /dos/z/16/src/fmemtest.c:415: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/maptest.c:69:0:0:
-openfiles: /dos/z/16/src/maptest0.c:446:0:0:
+openfiles: /dos/z/16/src/maptest0.c:253:85:0:
 openfiles: /dos/z/16/src/test.c:0:0:0:
 openfiles: /dos/z/16/src/test2.c:0:0:0:
-openfiles: /dos/z/16/src/lib/planar.h:0:0:0:
+openfiles: /dos/z/16/src/lib/planar.h:602:0:0:
 openfiles: /dos/z/16/src/lib/PLANAR.C:0:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.c:0:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.h:0:0:0:
@@ -22,8 +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/16/dongs.c:963:0:0:
-openfiles: /dos/z/16/makefile:1871:838:0:
+openfiles: /dos/z/16/src/lib/exmm/memory.c:496:0:1:
+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/src/lib/types.h:165:0:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
@@ -90,8 +94,13 @@ recent_files: file:///dos/z/16/src/emm.c
 recent_files: file:///dos/z/16/src/far.c
 recent_files: file:///dos/z/16/src/emstest.c
 recent_files: file:///dos/z/16/src/lib/exmm/x.bat
+recent_files: file:///dos/z/16/src/fmemtest.c
+recent_files: file:///dos/z/16/src/lib/exmm/emmret.h
+recent_files: file:///dos/z/16/src/lib/exmm/emmsize.h
+recent_files: file:///dos/z/16/src/lib/exmm/memory.h
+recent_files: file:///dos/z/16/src/lib/exmm/memory.c
 snr_replacetype: 0
-savedir: file:///dos/z/16/doc
+savedir: file:///dos/z/16
 spell_check_default: 1
 spell_insert_entities: 0
 last_filefilter: 

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

diff --git a/far.exe b/far.exe
deleted file mode 100644 (file)
index e424378..0000000
Binary files a/far.exe and /dev/null differ

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

diff --git a/16/fmemtest.exe b/fmemtest.exe
similarity index 100%
rename from 16/fmemtest.exe
rename to fmemtest.exe

diff --git a/makefile b/makefile
index da282deded3794a659d227fd0f3223a6b48c802f..91b877f5407cd12938b70c02cecd0c4efd8687e0 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 far.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
@@ -36,10 +39,12 @@ 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
 
-far.exe: far.obj memory.obj
-       wcl $(FLAGS) far.obj memory.obj
+fartest.exe: fartest.obj memory.obj
+       wcl $(FLAGS) fartest.obj memory.obj
 
-\r
+#
+#executable's objects
+#\r
 test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test.c\r
 \r
@@ -58,10 +63,15 @@ maptest0.obj: $(SRC)maptest0.c $(SRCLIB)modex16.h
 emmtest.obj: $(SRC)emmtest.c\r
        wcl $(FLAGS) -c $(SRC)emmtest.c\r
 
-far.obj: $(SRC)far.c\r
-       wcl $(FLAGS) -c $(SRC)far.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 +95,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/makefile~ b/makefile~
new file mode 100644 (file)
index 0000000..024480c
--- /dev/null
+++ b/makefile~
@@ -0,0 +1,97 @@
+#-zk0u = translate kanji to unicode... wwww\r
+#-zk0 = kanji support~\r
+#-zkl = current codepage\r
+\r
+CFLAGS=-zkl -wo -x -mc# -mh# -zdp# -zp16 -zq\r
+OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+\r
+FLAGS=-0 -d2 $(OFLAGS) $(CFLAGS)\r
+REMOVECOMMAND=del\r
+DIRSEP=\\r
+SRC=src$(DIRSEP)\r
+SRCLIB=$(SRC)lib$(DIRSEP)\r
+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
+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
+       wcl $(FLAGS) -c $(SRC)scroll.c\r
+test.exe: test.obj modex16.obj bitmap.obj lib_head.obj\r
+       wcl $(FLAGS) test.obj modex16.obj bitmap.obj lib_head.obj\r
+\r
+test2.exe: test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
+       wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
+\r
+pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj lib_head.obj\r
+       wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj lib_head.obj\r
+\r
+maptest.exe: maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj\r
+       wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj\r
+
+maptest0.exe: maptest0.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj\r
+       wcl $(FLAGS) maptest0.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj
+
+emmtest.exe: emmtest.obj memory.obj
+       wcl $(FLAGS) emmtest.obj memory.obj
+
+fartest.exe: fartest.obj memory.obj
+       wcl $(FLAGS) fartest.obj memory.obj
+
+\r
+test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
+       wcl $(FLAGS) -c $(SRC)test.c\r
+\r
+test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h\r
+       wcl $(FLAGS) -c $(SRC)test2.c\r
+\r
+pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
+       wcl $(FLAGS) -c $(SRC)pcxtest.c\r
+\r
+maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h
+       wcl $(FLAGS) -c $(SRC)maptest.c
+
+maptest0.obj: $(SRC)maptest0.c $(SRCLIB)modex16.h\r
+       wcl $(FLAGS) -c $(SRC)maptest0.c
+
+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
+
+\r
+modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
+       wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
+\r
+dos_kb.obj: $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c\r
+       wcl $(FLAGS) -c $(SRCLIB)dos_kb.c\r
+\r
+bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c\r
+       wcl $(FLAGS) -c $(SRCLIB)bitmap.c\r
+\r
+planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c\r
+       wcl $(FLAGS) -c $(SRCLIB)planar.c\r
+\r
+mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c\r
+       wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
+\r
+lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
+       wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r
+\r
+jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
+       wcl $(FLAGS) -c $(JSMNLIB)jsmn.c\r
+
+memory.obj: $(EXMMLIB)memory.h $(EXMMLIB)memory.c\r
+       wcl $(FLAGS) -c $(EXMMLIB)memory.c
+\r
+clean: .symbolic\r
+#      @$(REMOVECOMMAND) *.obj\r
+       @$(REMOVECOMMAND) *.OBJ\r
+#      @$(REMOVECOMMAND) *.out\r
+#      @$(REMOVECOMMAND) *.OUT\r
+       @$(REMOVECOMMAND) makefi~1\r
+       @$(REMOVECOMMAND) __WCL__.LNK\r
+#      @$(REMOVECOMMAND) *.smp\r
+       @$(REMOVECOMMAND) *.SMP\r

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

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

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

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

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

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

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

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