removed some junk

diff --git a/src/inputest.c b/src/inputest.c
index 08c5745f23ba582783ffc85fa8b19a0c761bbd2c..1bb0d78ca1bea007ce0f9b026c382735a7fc4b76 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -67,10 +67,6 @@ main(int argc, char *argv[])
        gvar.player[0].enti.d=2;\r
        gvar.player[0].enti.spt=4;\r
 \r
-//     wordtest();\r
-       bytetest();\r
-//0000 nibbletest();\r
-//0000 booleantest();\r
        //printf("dbg_testkeyin=%u      dbg_testcontrolnoisy=%u dbg_nogvar.playerinpu=%u\nloop if this is not responsive then please KILL or reset machine sorry!!\n", dbg_testkeyin, dbg_testcontrolnoisy, dbg_nogvar.playerinpu);\r
        while(!gvar.in.inst->Keyboard[sc_Escape])\r
        {\r

diff --git a/src/lib/16_head.c b/src/lib/16_head.c
index e5ddd6dc93ab56950c9f3d96a507d02275e94d83..4e8d333540ab8c05dcefcf0ab668e769cafe6658 100755 (executable)
--- a/src/lib/16_head.c
+++ b/src/lib/16_head.c
@@ -324,6 +324,7 @@ _dl=_DL;
 //     printf("        cf=%04x\npf=%04x\naf=%04x\nzf=%04x\nsf=%04x\ntf=%04x\nif=%04x\ndf=%04x\nof=%04x\n", _CF, _PF, _AF, _ZF, _SF, _TF, _IF, _DF, _OF);\r
        printf("cflag: "BYTE_TO_BINARY_PATTERN""BYTE_TO_BINARY_PATTERN"\n",             BYTE_TO_BINARY(_cflag>>8), BYTE_TO_BINARY(_cflag));\r
 //             printf("cflag: %s\n",(_cflag));\r
+       printf("dx: "NIBBLE_TO_BINARY_PATTERN""NIBBLE_TO_BINARY_PATTERN"\n",            NIBBLE_TO_BINARY(_dx>>4), NIBBLE_TO_BINARY(_dx));\r
 #endif\r
        printf("dx: "BYTE_TO_BINARY_PATTERN""BYTE_TO_BINARY_PATTERN"\n",                BYTE_TO_BINARY(_dx>>8), BYTE_TO_BINARY(_dx));\r
        printf("                ---------------------------------------\n");\r

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 0a71c965a040b9a467d81f3b1023f977f19220bc..888773b93a617fe1d5fbd3d5e245bd53fac0684e 100755 (executable)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -217,6 +217,13 @@ void regidump();
        (byte & 0x02 ? '1' : '0'), \\r
        (byte & 0x01 ? '1' : '0')\r
 \r
+#define NIBBLE_TO_BINARY_PATTERN "%c%c%c%c"\r
+#define NIBBLE_TO_BINARY(byte)  \\r
+       (byte & 0x08 ? '1' : '0'), \\r
+       (byte & 0x04 ? '1' : '0'), \\r
+       (byte & 0x02 ? '1' : '0'), \\r
+       (byte & 0x01 ? '1' : '0')\r
+\r
 #define PRINT_OPAQUE_STRUCT(p)  print_mem((p), sizeof(*(p)))\r
 \r
 #endif/*__16_HEAD_H__*/\r

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index d8f18b9483fa429b79bab5705ae0e653e9b438af..9cb0e76997507b1c8dbbb1eb3d7503c98a4877ee 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -792,101 +792,3 @@ void turboXT(byte bakapee)
        }\r
 }\r
 #endif\r
-\r
-//from https://stackoverflow.com/questions/18327439/printing-binary-representation-of-a-char-in-c\r
-const char *word_to_binary(int x)\r
-{\r
-       static char b[17];\r
-       int z;\r
-\r
-       b[0] = '\0';\r
-       for (z = 256; z > 0; z >>= 1)\r
-       {\r
-///            printf("                z=%u    b=%u    x=%u\n", z, b, x);\r
-               strcat(b, ((x & z) == z) ? "1" : "0");\r
-       }\r
-       return b;\r
-}\r
-\r
-const char *byte_to_binary(int x)\r
-{\r
-       static char b[9];\r
-       int z;\r
-\r
-       b[0] = '\0';\r
-       for (z = 128; z > 0; z >>= 1)\r
-       {\r
-               strcat(b, ((x & z) == z) ? "1" : "0");\r
-       }\r
-       return b;\r
-}\r
-\r
-const char *nibble_to_binary(int x)\r
-{\r
-       static char b[9];\r
-       int z;\r
-\r
-       b[0] = '\0';\r
-       for (z = 8; z > 0; z >>= 1)\r
-       {\r
-               strcat(b, ((x & z) == z) ? "1" : "0");\r
-       }\r
-       return b;\r
-}\r
-\r
-const char *boolean_to_binary(int x)\r
-{\r
-       static char b[3];\r
-       int z;\r
-\r
-       b[0] = '\0';\r
-       for (z = 1; z > 0; z >>= 1)\r
-       {\r
-               strcat(b, ((x & z) == z) ? "1" : "0");\r
-       }\r
-       return b;\r
-}\r
-\r
-void wordtest()\r
-{\r
-       word pee;\r
-       printf("wordtest\n");\r
-       /* word to binary string */\r
-       for(pee=0;pee<280;pee++)\r
-               printf("        %u      %s\n", pee, word_to_binary(pee));\r
-       printf("        sizeof(word)=%s\n", word_to_binary(sizeof(word)));\r
-       printf("end of word test\n");\r
-}\r
-\r
-void bytetest()\r
-{\r
-       byte pee;\r
-       printf("bytetest\n");\r
-       /* byte to binary string */\r
-       for(pee=0;pee<18;pee++)\r
-               printf("        %u      %s\n", pee, byte_to_binary(pee));\r
-       printf("        sizeof(byte)=%s\n", byte_to_binary(sizeof(byte)));\r
-       printf("end of byte test\n");\r
-}\r
-\r
-void nibbletest()\r
-{\r
-       nibble pee;\r
-       printf("nibbletest\n");\r
-       /* nibble to binary string */\r
-       for(pee=0;pee<18;pee++)\r
-               printf("        %u      %s\n", pee, nibble_to_binary(pee));\r
-       printf("        sizeof(nibble)=%s\n", nibble_to_binary(sizeof(nibble)));\r
-       printf("end of nibble test\n");\r
-}\r
-\r
-void booleantest()\r
-{\r
-       boolean pee;\r
-       printf("booleantest\n");\r
-       /* boolean to binary string */\r
-       for(pee=0;pee<4;pee++)\r
-               printf("        %u      %s\n", pee, boolean_to_binary(pee));\r
-       printf("        sizeof(boolean)=%s\n", boolean_to_binary(sizeof(boolean)));\r
-       printf("end of boolean test\n");\r
-}\r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 9d6555adbe017c2695d5f06d8be47a10292360c1..f0fa97b94399c6d1c65f46b5c200f5af719f46ef 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -141,13 +141,5 @@ void DebugMemory_(global_game_variables_t *gvar, boolean q);
 void ClearMemory (global_game_variables_t *gvar);\r
 void Quit (global_game_variables_t *gvar, char *error);\r
 void turboXT(byte bakapee);\r
-const char *word_to_binary(int x);\r
-const char *byte_to_binary(int x);\r
-const char *nibble_to_binary(int x);\r
-const char *boolean_to_binary(int x);\r
-void wordtest();\r
-void bytetest();\r
-void nibbletest();\r
-void booleantest();\r
 \r
 #endif /*__16_TAIL__ */\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 9a52516ac236cb67e1a8f0d9b06bd3f2120a8311..1c553707ed78522d5252677f94ddfcc31866d88f 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 9a52516ac236cb67e1a8f0d9b06bd3f2120a8311
+Subproject commit 1c553707ed78522d5252677f94ddfcc31866d88f