Less noise

msoos · msoos · commit a8904ced6ebb · 2025-10-01T23:08:39.000+02:00
diff --git a/src/comp_cache.hpp b/src/comp_cache.hpp
@@ -54,7 +54,7 @@ class CompCache: public CompCacheIF {
 
     return ret;
   }
-  uint32_t get_extra_bytes(void* c) const override {
+  uint64_t get_extra_bytes(void* c) const override {
     T* comp = reinterpret_cast<T*>(c);
     return comp->extra_bytes();
   }
@@ -98,7 +98,7 @@ class CompCache: public CompCacheIF {
   bool find_comp_and_incorporate_cnt(StackLevel &top, const uint32_t nvars, const void* c) override {
     const T& comp = *reinterpret_cast<const T*>(c);
     stats.num_cache_look_ups++;
-    uint32_t table_ofs = comp.get_hashkey() & tbl_size_mask;
+    uint32_t table_ofs = (uint32_t)comp.get_hashkey() & tbl_size_mask;
     CacheEntryID act_id = table[table_ofs];
     if (!act_id) return false;
     while(act_id){
@@ -192,7 +192,7 @@ class CompCache: public CompCacheIF {
   }
 
   uint32_t table_pos(CacheEntryID id) const {
-    return entry(id).get_hashkey() & tbl_size_mask;
+    return (uint32_t)entry(id).get_hashkey() & tbl_size_mask;
   }
 
   void add_descendant(CacheEntryID compid, CacheEntryID descendantid) {
diff --git a/src/comp_cache_if.hpp b/src/comp_cache_if.hpp
@@ -41,7 +41,7 @@ class CompCacheIF {
   virtual ~CompCacheIF();
 
   virtual CacheEntryID add_new_comp(void* comp, CacheEntryID super_comp_id) = 0;
-  virtual uint32_t get_extra_bytes(void* comp) const = 0;
+  virtual uint64_t get_extra_bytes(void* comp) const = 0;
   virtual bool find_comp_and_incorporate_cnt(StackLevel &top, const uint32_t nvars, const void* comp) = 0;
   virtual void* create_new_comp(const Comp &comp, uint64_t hash_seed, const BPCSizes& bpc) = 0;
   virtual void free_comp(void* comp) = 0;

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class CompCache: public CompCacheIF {`
`54`	`54`
`55`	`55`	`return ret;`
`56`	`56`	`}`
`57`		`- uint32_t get_extra_bytes(void* c) const override {`
	`57`	`+ uint64_t get_extra_bytes(void* c) const override {`
`58`	`58`	`T* comp = reinterpret_cast<T*>(c);`
`59`	`59`	`return comp->extra_bytes();`
`60`	`60`	`}`
`@@ -98,7 +98,7 @@ class CompCache: public CompCacheIF {`
`98`	`98`	`bool find_comp_and_incorporate_cnt(StackLevel &top, const uint32_t nvars, const void* c) override {`
`99`	`99`	`const T& comp = reinterpret_cast<const T>(c);`
`100`	`100`	`stats.num_cache_look_ups++;`
`101`		`- uint32_t table_ofs = comp.get_hashkey() & tbl_size_mask;`
	`101`	`+ uint32_t table_ofs = (uint32_t)comp.get_hashkey() & tbl_size_mask;`
`102`	`102`	`CacheEntryID act_id = table[table_ofs];`
`103`	`103`	`if (!act_id) return false;`
`104`	`104`	`while(act_id){`
`@@ -192,7 +192,7 @@ class CompCache: public CompCacheIF {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`uint32_t table_pos(CacheEntryID id) const {`
`195`		`- return entry(id).get_hashkey() & tbl_size_mask;`
	`195`	`+ return (uint32_t)entry(id).get_hashkey() & tbl_size_mask;`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`void add_descendant(CacheEntryID compid, CacheEntryID descendantid) {`