Simplified solver

1 files changed, 16 insertions, 1 deletions

diff --git a/src/solvers/tables.h b/src/solvers/tables.h
index 988de52..bad3b2c 100644
--- a/src/solvers/tables.h
+++ b/src/solvers/tables.h
@@ -14,7 +14,8 @@
 #define INFO_OFFSET_HASH         (INFO_OFFSET_FULLSIZE + sizeof(uint64_t))
 #define INFO_OFFSET_ENTRIES      (INFO_OFFSET_HASH + sizeof(uint64_t))
 #define INFO_OFFSET_CLASSES      (INFO_OFFSET_ENTRIES + sizeof(uint64_t))
-#define INFO_OFFSET_BITS         (INFO_OFFSET_CLASSES + sizeof(uint64_t))
+#define INFO_OFFSET_H48H         (INFO_OFFSET_CLASSES + sizeof(uint64_t))
+#define INFO_OFFSET_BITS         (INFO_OFFSET_H48H + sizeof(uint8_t))
 #define INFO_OFFSET_BASE         (INFO_OFFSET_BITS + sizeof(uint8_t))
 #define INFO_OFFSET_MAXVALUE     (INFO_OFFSET_BASE + sizeof(uint8_t))
 #define INFO_OFFSET_NEXT         (INFO_OFFSET_MAXVALUE + sizeof(uint8_t))
@@ -28,6 +29,7 @@ typedef struct {
         uint64_t hash;
         uint64_t entries;
         uint64_t classes; /* Used only by cocsepdata, for now */
+        uint8_t h48h; /* Specific to H48 tables */
         uint8_t bits;
         uint8_t base;
         uint8_t maxvalue;
@@ -36,6 +38,7 @@ typedef struct {
 } tableinfo_t;
 
 STATIC bool readtableinfo(const void *, tableinfo_t *);
+STATIC bool readtableinfo_n(const void *, uint8_t, tableinfo_t *);
 STATIC bool writetableinfo(const tableinfo_t *, void *);
 
 STATIC bool
@@ -59,6 +62,7 @@ readtableinfo(const void *buf, tableinfo_t *info)
         info->hash = *(const uint64_t *)OFFSET(buf, INFO_OFFSET_HASH);
         info->entries = *(const uint64_t *)OFFSET(buf, INFO_OFFSET_ENTRIES);
         info->classes = *(const uint64_t *)OFFSET(buf, INFO_OFFSET_CLASSES);
+        info->h48h = *OFFSET(buf, INFO_OFFSET_H48H);
         info->bits = *OFFSET(buf, INFO_OFFSET_BITS);
         info->base = *OFFSET(buf, INFO_OFFSET_BASE);
         info->maxvalue = *OFFSET(buf, INFO_OFFSET_MAXVALUE);
@@ -70,6 +74,16 @@ readtableinfo(const void *buf, tableinfo_t *info)
 }
 
 STATIC bool
+readtableinfo_n(const void *buf, uint8_t n, tableinfo_t *info)
+{
+        for ( ; n > 0; n--, buf = (char *)buf + info->next)
+                if (!readtableinfo(buf, info))
+                        return false;
+
+        return true;
+}
+
+STATIC bool
 writetableinfo(const tableinfo_t *info, void *buf)
 {
         int i;
@@ -98,6 +112,7 @@ writetableinfo(const tableinfo_t *info, void *buf)
         *(uint64_t *)OFFSET(buf, INFO_OFFSET_HASH) = info->hash;
         *(uint64_t *)OFFSET(buf, INFO_OFFSET_ENTRIES) = info->entries;
         *(uint64_t *)OFFSET(buf, INFO_OFFSET_CLASSES) = info->classes;
+        *OFFSET(buf, INFO_OFFSET_H48H) = info->h48h;
         *OFFSET(buf, INFO_OFFSET_BITS) = info->bits;
         *OFFSET(buf, INFO_OFFSET_BASE) = info->base;
         *OFFSET(buf, INFO_OFFSET_MAXVALUE) = info->maxvalue;