add support for 0x

script/manualext.py

@@ -134,9 +134,12 @@
 
 
 gid = 0
-def scan_write(code):
+def scan_write(code, dat="dat"):
     global gid
-    write_pattern = r'write_volatile_4\(DAT_([0-9a-f]+),uVar\d( & 0x([0-9a-f]+))*( \| 0x([0-9a-f]+))*\);'
+    if dat == 'dat':
+        write_pattern = r'write_volatile_4\(DAT_([0-9a-f]+),uVar\d( & 0x([0-9a-f]+))*( \| 0x([0-9a-f]+))*\);'
+    else:
+        write_pattern = r'write_volatile_4\(0x([0-9a-f]+),uVar\d( & 0x([0-9a-f]+))*( \| 0x([0-9a-f]+))*\);'
     for l in code:
         import re
         g = re.search(write_pattern, l)
@@ -326,7 +329,7 @@ def getregs(fname, pattern='name'):
 
 
 peris['bz_phy'] = Peripheral(peripheral('bz_phy', 0x40002000, 0x1000))
-scan_write(open('../blobs/bz_phy.c').readlines())
+scan_write(open('../blobs/bz_phy.c').readlines(), '0x')
 
 
 if __name__ == '__main__':

src/include/phy/bz_phy.h

@@ -2,6 +2,40 @@ typedef union {
 	uint32_t regs[0x400];
 	uint8_t pad[0x1000];
 	struct {
+		uint8_t pad0[0x808];
+		union {
+			uint32_t value;
+			struct {
+				uint32_t pad0 : 23;
+				uint32_t set_0x1_67 : 1; // @ 23 -- 23 # 0xff7fffff
+				uint32_t set_0x8_68 : 8; // @ 31 -- 24 # 0xffffff
+			};
+		} r0x2808; // @ 0x808
+		union {
+			uint32_t value;
+			struct {
+				uint32_t set_0x0_71 : 8; // @ 7 -- 0 # 0xffffff00
+				uint32_t pad0 : 15;
+				uint32_t set_0x1_69 : 1; // @ 23 -- 23 # 0xff7fffff
+				uint32_t set_0x4_70 : 8; // @ 31 -- 24 # 0xffffff
+			};
+		} r0x280c; // @ 0x80c
+		union {
+			uint32_t value;
+			struct {
+				uint32_t set_0x0_76 : 1; // @ 0 -- 0 # 0xfffffffe
+			};
+		} r0x2810; // @ 0x810
+		uint8_t pad1[0x40];
+		union {
+			uint32_t value;
+			struct {
+				uint32_t set_0x1e_75 : 8; // @ 7 -- 0 # 0xffffff00
+				uint32_t set_0x20_72 : 8; // @ 15 -- 8 # 0xffff00ff
+				uint32_t set_0xa_74 : 8; // @ 23 -- 16 # 0xff00ffff
+				uint32_t set_0x1e_73 : 8; // @ 31 -- 24 # 0xffffff
+			};
+		} r0x2854; // @ 0x854
 	};
 } bz_phy_regs;
 #define BZ_PHY_BASE 0x40002000