wwww testing huge map readings~

	modified:   maptest.exe
	modified:   maptest0.exe
	modified:   scroll.exe
	modified:   src/lib/mapread.c
	modified:   src/lib/mapread.h
	modified:   src/maptest0.c

diff --git a/maptest.exe b/maptest.exe
index dc50247e71496f23f3cb20cb85322f1315c3e87d..a772c37b6f76db0ae4f3f0b6b71a07bf5e4f65cf 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/maptest0.exe b/maptest0.exe
index 2fc0e966427e517c6a87514f4be476976d73c564..e58d6828e559661d64dc245c854f15f665009b17 100644 (file)
Binary files a/maptest0.exe and b/maptest0.exe differ

diff --git a/scroll.exe b/scroll.exe
index eedd2c97e39fdfed2b7e5cf369c4a090003d3752..0968b28b5f6629c39093519599f77e49ddf4d80d 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 63e123b71ffe70725ba757427bff9629c953f809..09c7ba46ecebe5701e7042e1a7569dd6d13a70f1 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -9,7 +9,7 @@ int jsoneq(const char huge *json, jsmntok_t huge *tok, const char huge *s) {
 }
 
 //this function is quite messy ^^; sorry! it is a quick and dirty fix~
-int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char *js_sv, map_t *map, int q) {
+int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char *js_sv, map_t huge *map, int q) {
        int i, j, k;
        bitmap_t bp;
        #ifdef DEBUG_JS
@@ -194,6 +194,9 @@ again:
                        //printf("buff=[%Fp]\n", buff);
                        //printf("(*buff)=[%Fp]\n", (*buff));
                        //printf("&(*buff)=[\n%s\n]\n", &(*buff));
+                       #ifdef DEBUG_DUMPVARS
+                       fprintf(stdout, "running dump~\n");
+                       #endif
                        dump(js, tok, p.toknext, incr, &js_ss, map, 0);
                        eof_expected = 1;
                }

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index 58769d5d01ae66e457e6f1a6290bb0c7853422af..eb75663e603b1c63fb795dd82bf80f2b42ae5d54 100644 (file)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -10,10 +10,10 @@
 #include "src/lib/modex16.h"
 #include "src/lib/lib_head.h"
 
-#define DEBUG_MAPDATA
+//#define DEBUG_MAPDATA
 #define DEBUG_MAPVAR
-#define DEBUG_DUMPVARS
-#define DEBUG_JS
+//#define DEBUG_DUMPVARS
+//#define DEBUG_JS
 
 typedef struct {\r
        bitmap_t *data;
@@ -31,7 +31,7 @@ typedef struct {
 } map_t;
 
 int jsoneq(const char huge *json, jsmntok_t huge *tok, const char huge *s);
-int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char *js_sv, map_t *map, int q);
+int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char *js_sv, map_t huge *map, int q);
 int loadmap(char *mn, map_t *map);
 
 #endif/*_LIBMAPREAD_H_*/

diff --git a/src/maptest0.c b/src/maptest0.c
index 244f16bcd49584b70b168beacc55211a5d8bdc5a..b682eb02f8626a5534406d831fe45784825bca70 100644 (file)
--- a/src/maptest0.c
+++ b/src/maptest0.c
@@ -2,7 +2,7 @@
 #include "src/lib/mapread.h"\r
 
 #define DUMP
-#define DUMP_MAP
+//#define DUMP_MAP
 
 void
 main(int argc, char *argv[])\r
@@ -11,12 +11,15 @@ main(int argc, char *argv[])
        short i;
        char *fmt = "Memory available = %u\n";
        char *fmt0 = "Largest Contiguous Block of Memory available = %u\n";
+
        fprintf(stderr, fmt, _memavl());
        fprintf(stderr, fmt0, _memmax());
-       while(!kbhit());
-       fprintf(stderr, "loading~\n");
+       fprintf(stderr, "Size of map var = %u\n", _msize(&map));
+       getch();
+
+       fprintf(stderr, "loading~\n\n");
        loadmap("data/tes0.map", &map);
-       fprintf(stderr, "okies~\n");
+       fprintf(stderr, "\nokies~\n");
        #ifdef DUMP
        fprintf(stdout, "map.width=     %d\n", map.width);
        fprintf(stdout, "map.height=    %d\n", map.height);