Move the STATE structure from state.c to stdlib.c

GJDuck · GJDuck · commit 2df89b0a909e · 2023-09-03T08:03:01.000+08:00
diff --git a/doc/e9tool-user-guide.md b/doc/e9tool-user-guide.md
@@ -1251,7 +1251,7 @@ Notes:
 * The `state` argument is a pointer to a structure containing all
   general-purpose registers, the flag register (`%rflags`), the stack register
   (`%rsp`) and the instruction pointer register (`%rip`).
-  See the `state.c` example for the structure layout.
+  See `STATE` defined in `stdlib.c` for the structure layout.
   Except for `%rip`, the values in the structure can be modified, in which
   case the corresponding register will be updated accordingly.
 * The `NAME[i]` argument will either be an integer or a string, depending on
diff --git a/examples/state.c b/examples/state.c
@@ -13,162 +13,6 @@
 
 #include "stdlib.c"
 
-/*
- * The "state" data structure.
- */
-struct STATE
-{
-    union
-    {
-        uint16_t rflags;
-        uint64_t __padding;
-    };
-    union
-    {
-        int64_t r15;
-        int32_t r15d;
-        int16_t r15w;
-        int8_t r15b;
-    };
-    union
-    {
-        int64_t r14;
-        int32_t r14d;
-        int16_t r14w;
-        int8_t r14b;
-    };
-    union
-    {
-        int64_t r13;
-        int32_t r13d;
-        int16_t r13w;
-        int8_t r13b;
-    };
-    union
-    {
-        int64_t r12;
-        int32_t r12d;
-        int16_t r12w;
-        int8_t r12b;
-    };
-    union
-    {
-        int64_t r11;
-        int32_t r11d;
-        int16_t r11w;
-        int8_t r11b;
-    };
-    union
-    {
-        int64_t r10;
-        int32_t r10d;
-        int16_t r10w;
-        int8_t r10b;
-    };
-    union
-    {
-        int64_t r9;
-        int32_t r9d;
-        int16_t r9w;
-        int8_t r9b;
-    };
-    union
-    {
-        int64_t r8;
-        int32_t r8d;
-        int16_t r8w;
-        int8_t r8b;
-    };
-    union
-    {
-        int64_t rdi;
-        int32_t edi;
-        int16_t di;
-        int8_t dil;
-    };
-    union
-    {
-        int64_t rsi;
-        int32_t esi;
-        int16_t si;
-        int8_t sil;
-    };
-    union
-    {
-        int64_t rbp;
-        int32_t ebp;
-        int16_t bp;
-        int8_t bpl;
-    };
-    union
-    {
-        int64_t rbx;
-        int32_t ebx;
-        int16_t bx;
-        struct
-        {
-            int8_t bl;
-            int8_t bh;
-        };
-    };
-    union
-    {
-        int64_t rdx;
-        int32_t edx;
-        int16_t dx;
-        struct
-        {
-            int8_t dl;
-            int8_t dh;
-        };
-    };
-    union
-    {
-        int64_t rcx;
-        int32_t ecx;
-        int16_t cx;
-        struct
-        {
-            int8_t cl;
-            int8_t ch;
-        };
-    };
-    union
-    {
-        int64_t rax;
-        int32_t eax;
-        int16_t ax;
-        struct
-        {
-            int8_t al;
-            int8_t ah;
-        };
-    };
-    union
-    {
-        int64_t rsp;
-        int32_t esp;
-        int16_t sp;
-        int16_t spl;
-    };
-    const union
-    {
-        int64_t rip;
-        int32_t eip;
-        int16_t ip;
-    };
-};
-
-/*
- * Flags.
- */
-#define OF      0x0001
-#define CF      0x0100
-#define PF      0x0400
-#define AF      0x1000
-#define ZF      0x4000
-#define SF      0x8000
-
 /*
  * Colors.
  */
diff --git a/examples/stdlib.c b/examples/stdlib.c
@@ -5513,6 +5513,166 @@ static uint16_t htons(uint16_t) __attribute__((__alias__("ntohs")));
 static uint32_t htonl(uint32_t) __attribute__((__alias__("ntohl")));
 static uint64_t htonll(uint64_t) __attribute__((__alias__("ntohll")));
 
+/****************************************************************************/
+/* STATE                                                                    */
+/****************************************************************************/
+
+/*
+ * The "state" data structure.
+ */
+struct STATE
+{
+    union
+    {
+        uint16_t rflags;
+        uint64_t __padding;
+    };
+    union
+    {
+        int64_t r15;
+        int32_t r15d;
+        int16_t r15w;
+        int8_t r15b;
+    };
+    union
+    {
+        int64_t r14;
+        int32_t r14d;
+        int16_t r14w;
+        int8_t r14b;
+    };
+    union
+    {
+        int64_t r13;
+        int32_t r13d;
+        int16_t r13w;
+        int8_t r13b;
+    };
+    union
+    {
+        int64_t r12;
+        int32_t r12d;
+        int16_t r12w;
+        int8_t r12b;
+    };
+    union
+    {
+        int64_t r11;
+        int32_t r11d;
+        int16_t r11w;
+        int8_t r11b;
+    };
+    union
+    {
+        int64_t r10;
+        int32_t r10d;
+        int16_t r10w;
+        int8_t r10b;
+    };
+    union
+    {
+        int64_t r9;
+        int32_t r9d;
+        int16_t r9w;
+        int8_t r9b;
+    };
+    union
+    {
+        int64_t r8;
+        int32_t r8d;
+        int16_t r8w;
+        int8_t r8b;
+    };
+    union
+    {
+        int64_t rdi;
+        int32_t edi;
+        int16_t di;
+        int8_t dil;
+    };
+    union
+    {
+        int64_t rsi;
+        int32_t esi;
+        int16_t si;
+        int8_t sil;
+    };
+    union
+    {
+        int64_t rbp;
+        int32_t ebp;
+        int16_t bp;
+        int8_t bpl;
+    };
+    union
+    {
+        int64_t rbx;
+        int32_t ebx;
+        int16_t bx;
+        struct
+        {
+            int8_t bl;
+            int8_t bh;
+        };
+    };
+    union
+    {
+        int64_t rdx;
+        int32_t edx;
+        int16_t dx;
+        struct
+        {
+            int8_t dl;
+            int8_t dh;
+        };
+    };
+    union
+    {
+        int64_t rcx;
+        int32_t ecx;
+        int16_t cx;
+        struct
+        {
+            int8_t cl;
+            int8_t ch;
+        };
+    };
+    union
+    {
+        int64_t rax;
+        int32_t eax;
+        int16_t ax;
+        struct
+        {
+            int8_t al;
+            int8_t ah;
+        };
+    };
+    union
+    {
+        int64_t rsp;
+        int32_t esp;
+        int16_t sp;
+        int16_t spl;
+    };
+    const union
+    {
+        int64_t rip;
+        int32_t eip;
+        int16_t ip;
+    };
+};
+
+/*
+ * Flags.
+ */
+#define OF      0x0001
+#define CF      0x0100
+#define PF      0x0400
+#define AF      0x1000
+#define ZF      0x4000
+#define SF      0x8000
+
 /****************************************************************************/
 /* MISC                                                                     */
 /****************************************************************************/
