tools,qemu-diff: refactor header files for x86

tools/qemu-diff/Makefile

@@ -7,7 +7,7 @@ $(error Invalid ISA. Supported: $(ISAS))
 endif
 endif
 
-INC_DIR += ./include ./src/isa/$(ISA)/include
+INC_DIR += ./include
 BUILD_DIR ?= ./build
 OBJ_DIR ?= $(BUILD_DIR)/obj-$(ISA)
 BINARY ?= $(BUILD_DIR)/$(ISA)-qemu-so
@@ -18,7 +18,8 @@ BINARY ?= $(BUILD_DIR)/$(ISA)-qemu-so
 CC = gcc
 LD = gcc
 INCLUDES  = $(addprefix -I, $(INC_DIR))
-CFLAGS   += -O2 -fPIC -MMD -Wall -Werror -DNEMU_HOME=$(NEMU_HOME) -ggdb3 $(INCLUDES) -fomit-frame-pointer
+CFLAGS   += -O2 -fPIC -MMD -Wall -Werror -DNEMU_HOME=$(NEMU_HOME) $(INCLUDES) \
+            -D_ISA_H_=\"isa/$(ISA).h\"
 
 # Files to be compiled
 SRCS = $(shell find src/ -name "*.c" | grep -v "isa")

tools/qemu-diff/src/isa/x86/include/isa.h → tools/qemu-diff/include/isa/x86.h

@@ -4,7 +4,7 @@
 #define ISA_QEMU_BIN "qemu-system-i386"
 #define ISA_QEMU_ARGS
 
-#include "../../../../../../src/isa/x86/include/isa/diff-test.h"
+#include "../../../../src/isa/x86/difftest/difftest.h"
 
 union isa_gdb_regs {
   struct {

tools/qemu-diff/include/protocol.h

@@ -18,7 +18,7 @@
  */
 
 #include <stdint.h>
-#include "isa.h"
+#include _ISA_H_
 
 struct gdb_conn;
 

tools/qemu-diff/src/diff-test.c

 #include "common.h"
 #include <sys/prctl.h>
 #include <signal.h>
-#include "isa.h"
+#include _ISA_H_
 
 bool gdb_connect_qemu(int);
 bool gdb_memcpy_to_qemu(uint32_t, void *, int);

tools/qemu-diff/src/isa/x86/init.c

 #include "common.h"
-#include "isa.h"
 
 bool gdb_memcpy_to_qemu(uint32_t, void *, int);
 bool gdb_getregs(union isa_gdb_regs *);