[Qemu-devel] [PATCH 2/3] gdbstub: x86: Support for setting segment registers

[Jan Kiszka]

This allows to set segment registers via gdb also in system emulation
mode. Basic sanity checks are applied and nothing is changed if they
fail. But screwing up the target via this interface will never be
complicated, so I avoided being too paranoid here.

Signed-off-by: Jan Kiszka <address@hidden>
---
 gdbstub.c               |   59 ++++++++++++++++++++++++++++++++++--------------
 target-i386/cpu.h       |   14 +++++++++++
 target-i386/op_helper.c |   14 -----------
 3 files changed, 57 insertions(+), 30 deletions(-)

Index: b/target-i386/cpu.h
===================================================================
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -637,6 +637,20 @@ int cpu_get_pic_interrupt(CPUX86State *s
 /* MSDOS compatibility mode FPU exception support */
 void cpu_set_ferr(CPUX86State *s);
 
+static inline unsigned int get_seg_limit(uint32_t e1, uint32_t e2)
+{
+    unsigned int limit;
+    limit = (e1 & 0xffff) | (e2 & 0x000f0000);
+    if (e2 & DESC_G_MASK)
+        limit = (limit << 12) | 0xfff;
+    return limit;
+}
+
+static inline uint32_t get_seg_base(uint32_t e1, uint32_t e2)
+{
+    return ((e1 >> 16) | ((e2 & 0xff) << 16) | (e2 & 0xff000000));
+}
+
 /* this function must always be used to load data in the segment
    cache: it synchronizes the hflags with the segment cache values */
 static inline void cpu_x86_load_seg_cache(CPUX86State *env,
Index: b/target-i386/op_helper.c
===================================================================
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -143,20 +143,6 @@ static inline int load_segment(uint32_t
     return 0;
 }
 
-static inline unsigned int get_seg_limit(uint32_t e1, uint32_t e2)
-{
-    unsigned int limit;
-    limit = (e1 & 0xffff) | (e2 & 0x000f0000);
-    if (e2 & DESC_G_MASK)
-        limit = (limit << 12) | 0xfff;
-    return limit;
-}
-
-static inline uint32_t get_seg_base(uint32_t e1, uint32_t e2)
-{
-    return ((e1 >> 16) | ((e2 & 0xff) << 16) | (e2 & 0xff000000));
-}
-
 static inline void load_seg_cache_raw_dt(SegmentCache *sc, uint32_t e1, 
uint32_t e2)
 {
     sc->base = get_seg_base(e1, e2);
Index: b/gdbstub.c
===================================================================
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -361,6 +361,43 @@ static int cpu_gdb_read_register(CPUStat
     }
 }
 
+static int cpu_x86_gdb_load_seg(CPUState *env, int sreg, uint8_t *mem_buf)
+{
+    uint16_t selector = ldl_p(mem_buf);
+
+    if (selector != env->segs[sreg].selector) {
+#if defined(CONFIG_USER_ONLY)
+        cpu_x86_load_seg(env, sreg, selector);
+#else
+        SegmentCache *dt;
+        target_ulong ptr;
+        uint32_t e1, e2;
+        int index;
+
+        if (!(env->cr[0] & CR0_PE_MASK) || (env->eflags & VM_MASK)) {
+            cpu_x86_load_seg_cache(env, sreg, selector, selector << 4,
+                                   0xffff, 0);
+        } else {
+            if (selector & 0x4)
+                dt = &env->ldt;
+            else
+                dt = &env->gdt;
+            index = selector & ~7;
+            ptr = dt->base + index;
+            if ((index + 7) <= dt->limit &&
+                cpu_memory_rw_debug(env, ptr, (uint8_t *)&e1,
+                                    sizeof(e1), 0) == 0 &&
+                cpu_memory_rw_debug(env, ptr + 4, (uint8_t *)&e2,
+                                    sizeof(e2), 0) == 0)
+                cpu_x86_load_seg_cache(env, sreg, selector,
+                                       get_seg_base(e1, e2),
+                                       get_seg_limit(e1, e2), e2);
+        }
+#endif
+    }
+    return 4;
+}
+
 static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n)
 {
     uint32_t tmp;
@@ -377,22 +414,12 @@ static int cpu_gdb_write_register(CPUSta
         env->eflags = ldl_p(mem_buf);
         return 4;
 
-#if defined(CONFIG_USER_ONLY)
-#define LOAD_SEG(index, sreg)\
-            tmp = ldl_p(mem_buf);\
-            if (tmp != env->segs[sreg].selector)\
-                cpu_x86_load_seg(env, sreg, tmp);
-#else
-/* FIXME: Honor segment registers.  Needs to avoid raising an exception
-   when the selector is invalid.  */
-#define LOAD_SEG(index, sreg) do {} while(0)
-#endif
-    case IDX_SEG_REGS + 0: LOAD_SEG(10, R_CS); return 4;
-    case IDX_SEG_REGS + 1: LOAD_SEG(11, R_SS); return 4;
-    case IDX_SEG_REGS + 2: LOAD_SEG(12, R_DS); return 4;
-    case IDX_SEG_REGS + 3: LOAD_SEG(13, R_ES); return 4;
-    case IDX_SEG_REGS + 4: LOAD_SEG(14, R_FS); return 4;
-    case IDX_SEG_REGS + 5: LOAD_SEG(15, R_GS); return 4;
+    case IDX_SEG_REGS + 0: return cpu_x86_gdb_load_seg(env, R_CS, mem_buf);
+    case IDX_SEG_REGS + 1: return cpu_x86_gdb_load_seg(env, R_SS, mem_buf);
+    case IDX_SEG_REGS + 2: return cpu_x86_gdb_load_seg(env, R_DS, mem_buf);
+    case IDX_SEG_REGS + 3: return cpu_x86_gdb_load_seg(env, R_ES, mem_buf);
+    case IDX_SEG_REGS + 4: return cpu_x86_gdb_load_seg(env, R_FS, mem_buf);
+    case IDX_SEG_REGS + 5: return cpu_x86_gdb_load_seg(env, R_GS, mem_buf);
 
     case IDX_FP_REGS ... IDX_FP_REGS + 7:
 #ifdef USE_X86LDOUBLE