diff --git a/data/chips/STM32G431C6.json b/data/chips/STM32G431C6.json
index e649d45..834c407 100644
--- a/data/chips/STM32G431C6.json
+++ b/data/chips/STM32G431C6.json
@@ -607,16 +607,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431C8.json b/data/chips/STM32G431C8.json
index eae454a..9a5b5de 100644
--- a/data/chips/STM32G431C8.json
+++ b/data/chips/STM32G431C8.json
@@ -607,16 +607,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431CB.json b/data/chips/STM32G431CB.json
index a4b3802..a43d3ff 100644
--- a/data/chips/STM32G431CB.json
+++ b/data/chips/STM32G431CB.json
@@ -907,16 +907,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431K6.json b/data/chips/STM32G431K6.json
index 3e5d1e7..60f28e2 100644
--- a/data/chips/STM32G431K6.json
+++ b/data/chips/STM32G431K6.json
@@ -415,16 +415,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431K8.json b/data/chips/STM32G431K8.json
index c280ca6..297c56f 100644
--- a/data/chips/STM32G431K8.json
+++ b/data/chips/STM32G431K8.json
@@ -415,16 +415,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431KB.json b/data/chips/STM32G431KB.json
index cbf4d3f..4448052 100644
--- a/data/chips/STM32G431KB.json
+++ b/data/chips/STM32G431KB.json
@@ -415,16 +415,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431M6.json b/data/chips/STM32G431M6.json
index 91ac5de..5eb5a89 100644
--- a/data/chips/STM32G431M6.json
+++ b/data/chips/STM32G431M6.json
@@ -505,16 +505,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431M8.json b/data/chips/STM32G431M8.json
index e8ae011..46439f9 100644
--- a/data/chips/STM32G431M8.json
+++ b/data/chips/STM32G431M8.json
@@ -505,16 +505,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431MB.json b/data/chips/STM32G431MB.json
index 436ec56..faf49c7 100644
--- a/data/chips/STM32G431MB.json
+++ b/data/chips/STM32G431MB.json
@@ -505,16 +505,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431R6.json b/data/chips/STM32G431R6.json
index e459337..0d4b864 100644
--- a/data/chips/STM32G431R6.json
+++ b/data/chips/STM32G431R6.json
@@ -799,16 +799,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431R8.json b/data/chips/STM32G431R8.json
index da8d809..6b653b2 100644
--- a/data/chips/STM32G431R8.json
+++ b/data/chips/STM32G431R8.json
@@ -799,16 +799,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431RB.json b/data/chips/STM32G431RB.json
index 3ad7d99..ea6d733 100644
--- a/data/chips/STM32G431RB.json
+++ b/data/chips/STM32G431RB.json
@@ -799,16 +799,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431V6.json b/data/chips/STM32G431V6.json
index 0703261..b4d959d 100644
--- a/data/chips/STM32G431V6.json
+++ b/data/chips/STM32G431V6.json
@@ -625,16 +625,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431V8.json b/data/chips/STM32G431V8.json
index 9f4f237..3c94393 100644
--- a/data/chips/STM32G431V8.json
+++ b/data/chips/STM32G431V8.json
@@ -625,16 +625,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G431VB.json b/data/chips/STM32G431VB.json
index 2cef2ab..f92394f 100644
--- a/data/chips/STM32G431VB.json
+++ b/data/chips/STM32G431VB.json
@@ -625,16 +625,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G441CB.json b/data/chips/STM32G441CB.json
index 781a69e..fe0fd6b 100644
--- a/data/chips/STM32G441CB.json
+++ b/data/chips/STM32G441CB.json
@@ -907,16 +907,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G441KB.json b/data/chips/STM32G441KB.json
index 52a286e..fb8e81c 100644
--- a/data/chips/STM32G441KB.json
+++ b/data/chips/STM32G441KB.json
@@ -415,16 +415,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G441MB.json b/data/chips/STM32G441MB.json
index f381008..2923e7e 100644
--- a/data/chips/STM32G441MB.json
+++ b/data/chips/STM32G441MB.json
@@ -505,16 +505,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G441RB.json b/data/chips/STM32G441RB.json
index e02d0fc..c008226 100644
--- a/data/chips/STM32G441RB.json
+++ b/data/chips/STM32G441RB.json
@@ -799,16 +799,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [
diff --git a/data/chips/STM32G441VB.json b/data/chips/STM32G441VB.json
index ef53465..ab5e1ec 100644
--- a/data/chips/STM32G441VB.json
+++ b/data/chips/STM32G441VB.json
@@ -625,16 +625,28 @@
             }
         },
         {
-            "name": "SRAM",
+            "name": "CCM_SRAM_ICODE",
+            "kind": "ram",
+            "address": 268435456,
+            "size": 10240
+        },
+        {
+            "name": "SRAM1",
             "kind": "ram",
             "address": 536870912,
-            "size": 20480
+            "size": 16384
         },
         {
             "name": "SRAM2",
             "kind": "ram",
             "address": 536887296,
-            "size": 0
+            "size": 6144
+        },
+        {
+            "name": "CCM_SRAM_DCODE",
+            "kind": "ram",
+            "address": 536893440,
+            "size": 10240
         }
     ],
     "docs": [