diff --git a/src/cpu/codegen_ops_arith.h b/src/cpu/codegen_ops_arith.h
index 5675a5e..e76187c 100644
--- a/src/cpu/codegen_ops_arith.h
+++ b/src/cpu/codegen_ops_arith.h
@@ -116,7 +116,7 @@ static uint32_t ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uin
         static uint32_t rop ## name ## _b_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)    \
         {                                                                                                                               \
                 int src_reg, dst_reg;                                                                                                   \
-                x86seg *target_seg;                                                                                                     \
+                x86seg *target_seg = NULL;                                                                                                     \
                                                                                                                                         \
                 if ((fetchdat & 0xc0) == 0xc0)                                                                                          \
                 {                                                                                                                       \
@@ -156,7 +156,7 @@ static uint32_t ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uin
         static uint32_t rop ## name ## _w_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)    \
         {                                                                                                                               \
                 int src_reg, dst_reg;                                                                                                   \
-                x86seg *target_seg;                                                                                                     \
+                x86seg *target_seg = NULL;                                                                                                     \
                                                                                                                                         \
                 if ((fetchdat & 0xc0) == 0xc0)                                                                                          \
                 {                                                                                                                       \
@@ -196,7 +196,7 @@ static uint32_t ropDEC_rl(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uin
         static uint32_t rop ## name ## _l_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)    \
         {                                                                                                                               \
                 int src_reg, dst_reg;                                                                                                   \
-                x86seg *target_seg;                                                                                                     \
+                x86seg *target_seg = NULL;                                                                                                     \
                                                                                                                                         \
                 if ((fetchdat & 0xc0) == 0xc0)                                                                                          \
                 {                                                                                                                       \
diff --git a/src/cpu/codegen_ops_logic.h b/src/cpu/codegen_ops_logic.h
index 9e3b92f..4429ab8 100644
--- a/src/cpu/codegen_ops_logic.h
+++ b/src/cpu/codegen_ops_logic.h
@@ -39,7 +39,7 @@
         static uint32_t rop ## name ## _b_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)    \
         {                                                                                                                               \
                 int src_reg, dst_reg;                                                                                                   \
-                x86seg *target_seg;                                                                                                     \
+                x86seg *target_seg = NULL;                                                                                                     \
                                                                                                                                         \
                 if ((fetchdat & 0xc0) == 0xc0)                                                                                          \
                 {                                                                                                                       \
@@ -76,7 +76,7 @@
         static uint32_t rop ## name ## _w_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)    \
         {                                                                                                                               \
                 int src_reg, dst_reg;                                                                                                   \
-                x86seg *target_seg;                                                                                                     \
+                x86seg *target_seg = NULL;                                                                                                     \
                                                                                                                                         \
                 if ((fetchdat & 0xc0) == 0xc0)                                                                                          \
                 {                                                                                                                       \
@@ -113,7 +113,7 @@
         static uint32_t rop ## name ## _l_rmw(uint8_t opcode, uint32_t fetchdat, uint32_t op_32, uint32_t op_pc, codeblock_t *block)    \
         {                                                                                                                               \
                 int src_reg, dst_reg;                                                                                                   \
-                x86seg *target_seg;                                                                                                     \
+                x86seg *target_seg = NULL;                                                                                                     \
                                                                                                                                         \
                 if ((fetchdat & 0xc0) == 0xc0)                                                                                          \
                 {                                                                                                                       \