fixes duplicate variable declaration and templates

gen_input/TGC_C.core_desc

@@ -1,13 +1,13 @@
-import "RV32I.core_desc"
-import "RVM.core_desc"
-import "RVC.core_desc"
+import "ISA/RV32I.core_desc"
+import "ISA/RVM.core_desc"
+import "ISA/RVC.core_desc"
 
 Core TGC_C provides RV32I, Zicsr, Zifencei, RV32M, RV32IC {
     architectural_state {
         XLEN=32;
         // definitions for the architecture wrapper
         //                    XL    ZYXWVUTSRQPONMLKJIHGFEDCBA
-        unsigned MISA_VAL = 0b01000000000000000001000100000100;
-        unsigned MARCHID_VAL = 0x80000003;
+        unsigned int MISA_VAL = 0b01000000000000000001000100000100;
+        unsigned int MARCHID_VAL = 0x80000003;
     }
 }