slightly faster hash function (using crc32), with precomputed polynomial table (256x3...

diff --git a/assembler.c b/assembler.c
index 59ee27b4af1a5c4d018da3cda3af750169d94b4f..ece24a2d0bd98128ba37d467fac6f109d3ad3c88 100644 (file)
--- a/assembler.c
+++ b/assembler.c
@@ -200,7 +200,7 @@ void asm_parse(FILE *fp) {
         
         /* if we made it this far something is wrong */
         if (*skip != '\0')
-            printf("%li: Invalid statement, expression, or decleration\n", line);
+            printf("%li: Invalid statement %s, expression, or decleration\n", line, skip);
         
         end:
         mem_d(data);

diff --git a/gmqcc.h b/gmqcc.h
index 6e7bb8b1e3a1d3f3ae7815bd1ea0a1efe6aa1b30..ba53228215bff807ba03d690581f4a4abc17e858 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -167,6 +167,8 @@ void  util_debug     (const char *, const char *, ...);
 int   util_getline   (char **, size_t *, FILE *);
 void  util_endianswap(void *, int, int);
 
+uint32_t util_crc32(const char *, int, register const short); 
+
 #ifdef NOTRACK
 #    define mem_a(x) malloc(x)
 #    define mem_d(x) free  (x)

diff --git a/main.c b/main.c
index 1570201656ac4ef5025d0cef122ffe1bfad76e9f..bc1a037d0e698b01c0fdf6e4c35a33b30abe8775 100644 (file)
--- a/main.c
+++ b/main.c
@@ -31,11 +31,15 @@ int opts_memchk = 0;
 
 static const int usage(const char *const app) {
     printf("usage:\n");
-    printf("    %s -c<file> -- compile file\n" , app);
-    printf("    %s -a<file> -- assemble file\n", app);
+    printf("    %s -c<file>          -oprog.dat -- compile file\n"     , app);
+    printf("    %s -a<file>          -oprog.dat -- assemble file\n"    , app);
+    printf("    %s -c<file> -i<file> -oprog.dat -- compile together (allowed multiple -i<file>)\n" , app);
+    printf("    %s -a<file> -i<file> -oprog.dat -- assemble together(allowed multiple -i<file>)\n", app);
+    printf("    example:\n");
+    printf("    %s -cfoo.qc -ibar.qc -oqc.dat -afoo.qs -ibar.qs -oqs.dat\n", app);
     printf("    additional flags:\n");
-    printf("        -debug  -- turns on compiler debug messages\n");
-    printf("        -memchk -- turns on compiler memory leak check\n");
+    printf("        -debug           -- turns on compiler debug messages\n");
+    printf("        -memchk          -- turns on compiler memory leak check\n");
     
     return -1;
 }
@@ -56,6 +60,7 @@ int main(int argc, char **argv) {
         switch (argv[1][1]) {
             case 'c': items_add((argitem){util_strdup(&argv[1][2]), 0}); break; /* compile  */ 
             case 'a': items_add((argitem){util_strdup(&argv[1][2]), 1}); break; /* assemble */
+            case 'i': items_add((argitem){util_strdup(&argv[1][2]), 2}); break; /* includes */
             default:
                 if (!strncmp(&argv[1][1], "debug" , 5)) { opts_debug  = 1; break; }
                 if (!strncmp(&argv[1][1], "memchk", 6)) { opts_memchk = 1; break; }

diff --git a/typedef.c b/typedef.c
index 0259f350c32d7de88f7e7cd02673fb246b388799..d9be47817df95489a427cc26b268afa6496ca1d3 100644 (file)
--- a/typedef.c
+++ b/typedef.c
@@ -29,21 +29,8 @@ void typedef_init() {
         typedef_table[i] = NULL;
 }
 
-unsigned int typedef_hash(const char *s) {
-    unsigned int hash = 0;
-    unsigned int size = strlen(s);
-    unsigned int iter;
-    
-    for (iter = 0; iter < size; iter++) {
-        hash += s[iter];
-        hash += (hash << 10);
-        hash ^= (hash >> 6);
-    }
-    hash += (hash << 3);
-    hash ^= (hash >> 11);
-    hash += (hash << 15);
-    
-    return hash % 1024;
+uint32_t typedef_hash(const char *s) {
+    return util_crc32(s, strlen(s), 1024);
 }
 
 typedef_node *typedef_find(const char *s) {

diff --git a/util.c b/util.c
index 3d069e18b8749687542ede403c2014cee7f60ca0..b44d1c163eb33ba703129b27c3768e7dc242d854 100644 (file)
--- a/util.c
+++ b/util.c
@@ -173,6 +173,69 @@ void util_endianswap(void *m, int s, int l) {
     }
 }
 
+/*
+ * This is an implementation of CRC32.  The polynomial has been offline
+ * computed for faster generation at the cost of larger code size.  This
+ * is used to compute hashes for hash-table.  This is not used for crc16
+ * generation of progs header calculation.
+ */
+#define util_crc32_update(O,C) \
+    (util_crc32_table[((C)^((unsigned char)O)) & 0xFF] ^ ((C)>>8))
+
+/* CRC polynomial 0xEDB88320 */
+static const uint32_t util_crc32_table[] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+    0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+    0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+    0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+    0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+    0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+    0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+    0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+    0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+    0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+    0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+    0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+    0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+    0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+uint32_t util_crc32(const char *key, int len, register const short clamp) {
+    register uint32_t hash = 0xFFFFFFFF;
+    for (; len; --len, ++key)
+        hash = util_crc32_update(*key, hash);
+    return (~hash) % clamp;
+}
+
 /*
  * Implements libc getline for systems that don't have it, which is 
  * assmed all.  This works the same as getline().