The 286/386 interpreter now has its own variant of x86seg.c.

src/codegen_new/codegen.c

@@ -6,6 +6,8 @@
 #include "x86_ops.h"
 #include "codegen.h"
 #include "x86.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 
 #include "386_common.h"
 

src/codegen_new/codegen_backend_arm.c

@@ -13,6 +13,8 @@
 #    include "codegen_backend_arm_ops.h"
 #    include "codegen_reg.h"
 #    include "x86.h"
+#    include "x86seg_common.h"
+#    include "x86seg.h"
 #    include "x87.h"
 
 #    if defined(__linux__) || defined(__APPLE__)

src/codegen_new/codegen_backend_arm64.c

@@ -13,6 +13,8 @@
 #    include "codegen_backend_arm64_ops.h"
 #    include "codegen_reg.h"
 #    include "x86.h"
+#    include "x86seg_common.h"
+#    include "x86seg.h"
 #    include "x87.h"
 
 #    if defined(__linux__) || defined(__APPLE__)

src/codegen_new/codegen_backend_arm64_uops.c

@@ -6,6 +6,8 @@
 #    include <86box/mem.h>
 
 #    include "x86.h"
+#    include "x86seg_common.h"
+#    include "x86seg.h"
 #    include "x87.h"
 #    include "386_common.h"
 #    include "codegen.h"

src/codegen_new/codegen_backend_arm_uops.c

@@ -7,6 +7,8 @@
 #    include <86box/mem.h>
 
 #    include "x86.h"
+#    include "x86seg_common.h"
+#    include "x86seg.h"
 #    include "x87.h"
 #    include "386_common.h"
 #    include "codegen.h"

src/codegen_new/codegen_backend_x86-64.c

@@ -14,6 +14,8 @@
 #    include "codegen_backend_x86-64_ops_sse.h"
 #    include "codegen_reg.h"
 #    include "x86.h"
+#    include "x86seg_common.h"
+#    include "x86seg.h"
 
 #    if defined(__linux__) || defined(__APPLE__)
 #        include <sys/mman.h>

src/codegen_new/codegen_backend_x86-64_uops.c

@@ -6,6 +6,8 @@
 #    include <86box/mem.h>
 
 #    include "x86.h"
+#    include "x86seg_common.h"
+#    include "x86seg.h"
 #    include "x87.h"
 #    include "386_common.h"
 #    include "codegen.h"

src/codegen_new/codegen_backend_x86.c

@@ -15,6 +15,8 @@
 #    include "codegen_backend_x86_ops_sse.h"
 #    include "codegen_reg.h"
 #    include "x86.h"
+#    include "x86seg_common.h"
+#    include "x86seg.h"
 
 #    if defined(__linux__) || defined(__APPLE__)
 #        include <sys/mman.h>

src/codegen_new/codegen_backend_x86_uops.c

@@ -7,6 +7,8 @@
 
 #    include "x86.h"
 #    include "x86_ops.h"
+#    include "x86seg_common.h"
+#    include "x86seg.h"
 #    include "386_common.h"
 #    include "codegen.h"
 #    include "codegen_allocator.h"

src/codegen_new/codegen_block.c

@@ -9,6 +9,8 @@
 #include "x86.h"
 #include "x86_flags.h"
 #include "x86_ops.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "x87.h"
 
 #include "386_common.h"

src/codegen_new/codegen_ops_3dnow.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"

src/codegen_new/codegen_ops_arith.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_ir.h"

src/codegen_new/codegen_ops_branch.c

@@ -4,6 +4,8 @@
 #include <86box/mem.h>
 
 #include "x86.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "x86_flags.h"
 #include "codegen.h"

src/codegen_new/codegen_ops_fpu_arith.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "x87.h"
 #include "codegen.h"

src/codegen_new/codegen_ops_fpu_constant.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "x87.h"
 #include "codegen.h"

src/codegen_new/codegen_ops_fpu_loadstore.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "x87.h"
 #include "codegen.h"

src/codegen_new/codegen_ops_fpu_misc.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "x87.h"
 #include "codegen.h"

src/codegen_new/codegen_ops_helpers.c

@@ -4,6 +4,8 @@
 #include <86box/mem.h>
 
 #include "x86.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_ir.h"

src/codegen_new/codegen_ops_jump.c

@@ -4,6 +4,8 @@
 #include <86box/mem.h>
 
 #include "x86.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_ir.h"

src/codegen_new/codegen_ops_logic.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_ir.h"

src/codegen_new/codegen_ops_misc.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_ir.h"

src/codegen_new/codegen_ops_mmx_arith.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"

src/codegen_new/codegen_ops_mmx_cmp.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"

src/codegen_new/codegen_ops_mmx_loadstore.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"

src/codegen_new/codegen_ops_mmx_logic.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"

src/codegen_new/codegen_ops_mmx_pack.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"

src/codegen_new/codegen_ops_mmx_shift.c

@@ -5,6 +5,8 @@
 
 #include "x86.h"
 #include "x86_flags.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_accumulate.h"

src/codegen_new/codegen_ops_mov.c

@@ -4,6 +4,8 @@
 #include <86box/mem.h>
 
 #include "x86.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "386_common.h"
 #include "codegen.h"
 #include "codegen_ir.h"

src/codegen_new/codegen_ops_shift.c

@@ -4,6 +4,8 @@
 #include <86box/mem.h>
 
 #include "x86.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "x86_flags.h"
 #include "386_common.h"
 #include "codegen.h"

src/codegen_new/codegen_ops_stack.c

@@ -4,6 +4,8 @@
 #include <86box/mem.h>
 
 #include "x86.h"
+#include "x86seg_common.h"
+#include "x86seg.h"
 #include "x86_flags.h"
 #include "386_common.h"
 #include "codegen.h"