hashlib: fix pyosys

YosysHQ · Oct 9, 2024 · ead99bb · ead99bb
1 parent 7f06ab1
commit ead99bb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/kernel/hashlib.h b/kernel/hashlib.h
@@ -110,7 +110,12 @@ class Hasher {
 	}
 
 	template<typename T>
-	void acc(T t) {
+	void acc(T&& t) {
+		*this = hash_ops<std::remove_cv_t<std::remove_reference_t<T>>>::hash_acc(std::forward<T>(t), *this);
+	}
+
+	template<typename T>
+	void acc(const T& t) {
 		*this = hash_ops<T>::hash_acc(t, *this);
 	}
 

diff --git a/misc/py_wrap_generator.py b/misc/py_wrap_generator.py
@@ -850,7 +850,11 @@ def gen_decl(self, filename):
 		if self.hash_id != None:
 			text += "\n\t\tunsigned int get_hash_py()"
 			text += "\n\t\t{"
-			text += "\n\t\t\treturn get_cpp_obj()->" + self.hash_id + ";"
+			suffix = f"->{self.hash_id}" if self.hash_id else f"->{self.hash_id}"
+			if self.hash_id == "":
+				text += f"\n\t\t\treturn run_hash(*(get_cpp_obj()));"
+			else:
+				text += f"\n\t\t\treturn run_hash(get_cpp_obj()->{self.hash_id});"
 			text += "\n\t\t}"
 
 		text += "\n\t};\n"
@@ -951,7 +955,7 @@ def contains_default_constr(self):
 
 sources = [
 	Source("kernel/celltypes",[
-		WClass("CellType", link_types.pointer, None, None, "type.hash()", True),
+		WClass("CellType", link_types.pointer, None, None, "type", True),
 		WClass("CellTypes", link_types.pointer, None, None, None, True)
 		]
 		),
@@ -965,23 +969,23 @@ def contains_default_constr(self):
 		]
 		),
 	Source("kernel/rtlil",[
-		WClass("IdString", link_types.ref_copy, None, "str()", "hash()"),
-		WClass("Const", link_types.ref_copy, None, "as_string()", "hash()"),
+		WClass("IdString", link_types.ref_copy, None, "str()", ""),
+		WClass("Const", link_types.ref_copy, None, "as_string()", ""),
 		WClass("AttrObject", link_types.ref_copy, None, None, None),
 		WClass("Selection", link_types.ref_copy, None, None, None),
 		WClass("Monitor", link_types.derive, None, None, None),
 		WClass("CaseRule",link_types.ref_copy, None, None, None, True),
 		WClass("SwitchRule",link_types.ref_copy, None, None, None, True),
 		WClass("SyncRule", link_types.ref_copy, None, None, None, True),
-		WClass("Process",  link_types.ref_copy, None, "name.c_str()", "name.hash()"),
+		WClass("Process",  link_types.ref_copy, None, "name.c_str()", "name"),
 		WClass("SigChunk", link_types.ref_copy, None, None, None),
-		WClass("SigBit", link_types.ref_copy, None, None, "hash()"),
-		WClass("SigSpec", link_types.ref_copy, None, None, "hash()"),
-		WClass("Cell", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", "hash()"),
-		WClass("Wire", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", "hash()"),
-		WClass("Memory", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", "hash()"),
-		WClass("Module", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", "hash()"),
-		WClass("Design", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "hashidx_", "hash()")
+		WClass("SigBit", link_types.ref_copy, None, None, ""),
+		WClass("SigSpec", link_types.ref_copy, None, None, ""),
+		WClass("Cell", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", ""),
+		WClass("Wire", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", ""),
+		WClass("Memory", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", ""),
+		WClass("Module", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", ""),
+		WClass("Design", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "hashidx_", "")
 		]
 		),
 	#Source("kernel/satgen",[