CPU architecture selection

diff -u -p -r1.42 cpu-all.h
@@ -760,4 +760,19 @@ void cpu_physical_memory_reset_dirty(tar
 void dump_exec_info(FILE *f,
                     int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
 
+/* Architecture flags for different CPU variants.  */
+typedef unsigned int cpu_archflags;
+struct cpu_arches
+{
+  const char * name;
+  cpu_archflags flags;
+};
+extern const struct cpu_arches cpu_arches[NUM_CPU_ARCHES];
+extern cpu_archflags current_cpu_archflags;
+void parse_cpu_archflags (const char *);
+void parse_cpu_archflags (const char *);
+void show_available_archflags (void);
+
+#define HAVE_ARCH(x) ((current_cpu_archflags & CPU_ARCH_ ## x) != 0)
+
 #endif /* CPU_ALL_H */

84 lines not on this page · raw message

diff -u -p -r1.124 vl.c
@@ -2784,6 +2784,7 @@ void help(void)
            "                (default is CL-GD5446 PCI VGA)\n"
 #endif
            "-loadvm file    start right away with a saved state (loadvm in monitor)\n"
+	   "-cpu cpu        set the emulated CPU variant (default=%s)\n"
            "\n"
            "During emulation, the following keys are useful:\n"
            "ctrl-alt-f      toggle full screen\n"

@@ -2800,7 +2801,9 @@ void help(void)
            DEFAULT_RAM_SIZE,
            DEFAULT_NETWORK_SCRIPT,
            DEFAULT_GDBSTUB_PORT,
-           "/tmp/qemu.log");
+           "/tmp/qemu.log",
+           CPU_DEFAULT_ARCH);
+    show_available_archflags ();
 #ifndef CONFIG_SOFTMMU
     printf("\n"
            "NOTE: this version of QEMU is faster but it needs slightly patched OSes to\n"

@@ -2864,6 +2867,7 @@ enum {
     QEMU_OPTION_full_screen,
     QEMU_OPTION_pidfile,
     QEMU_OPTION_no_kqemu,
+    QEMU_OPTION_cpu,
 };
 
 typedef struct QEMUOption {

@@ -2936,6 +2940,7 @@ const QEMUOption qemu_options[] = {
     /* temporary options */
     { "pci", 0, QEMU_OPTION_pci },
     { "cirrusvga", 0, QEMU_OPTION_cirrusvga },
+    { "cpu", HAS_ARG, QEMU_OPTION_cpu },
     { NULL },
 };
 

@@ -3014,6 +3019,7 @@ int main(int argc, char **argv)
     char parallel_devices[MAX_PARALLEL_PORTS][128];
     int parallel_device_index;
     const char *loadvm = NULL;
+    int set_cpu = 0;
     
 #if !defined(CONFIG_SOFTMMU)
     /* we never want that malloc() uses mmap() */

@@ -3383,6 +3389,10 @@ int main(int argc, char **argv)
             case QEMU_OPTION_pidfile:
                 create_pidfile(optarg);
                 break;
+            case QEMU_OPTION_cpu:
+                parse_cpu_archflags(optarg);
+                set_cpu = 1;
+                break;
 #ifdef USE_KQEMU
             case QEMU_OPTION_no_kqemu:
                 kqemu_allowed = 0;

@@ -3459,6 +3469,9 @@ int main(int argc, char **argv)
         }
     }
 
+    if (set_cpu)
+	parse_cpu_archflags(CPU_DEFAULT_ARCH);
+
     /* init the memory */
     phys_ram_size = ram_size + vga_ram_size + bios_size;
 

diff -u -p -r1.62 main.c
@@ -330,7 +330,8 @@ void cpu_loop(CPUARMState *env)
                 /* we get the opcode */
                 opcode = ldl_raw((uint8_t *)env->regs[15]);
                 
-                if (EmulateAll(opcode, &ts->fpa, env->regs) == 0) {
+                if ((current_cpu_archflags & CPU_ARCH_FPA) == 0
+		    || EmulateAll(opcode, &ts->fpa, env->regs) == 0) {
                     info.si_signo = SIGILL;
                     info.si_errno = 0;
                     info.si_code = TARGET_ILL_ILLOPN;

@@ -942,11 +943,14 @@ void usage(void)
            "-no-code-copy   disable code copy acceleration\n"
 #endif
            "-d options   activate log (logfile=%s)\n"
-           "-p pagesize  set the host page size to 'pagesize'\n",
+           "-p pagesize  set the host page size to 'pagesize'\n"
+           "-cpu cpu     set the emulated CPU variant (default=%s)\n",
            TARGET_ARCH,
            interp_prefix, 
            x86_stack_size,
-           DEBUG_LOGFILE);
+           DEBUG_LOGFILE,
+           CPU_DEFAULT_ARCH);
+    show_available_archflags ();
     _exit(1);
 }
 

@@ -967,6 +971,7 @@ int main(int argc, char **argv)
     CPUState *env;
     int optind;
     const char *r;
+    int set_cpu = 0;
     
     if (argc <= 1)
         usage();

@@ -1020,6 +1025,14 @@ int main(int argc, char **argv)
                 fprintf(stderr, "page size must be a power of two\n");
                 exit(1);
             }
+        } else if (!strncmp(r, "cpu", 3)) {
+            if (r[3] != '=' && (r[3] != 0 || optind >= argc))
+                break;
+            if (r[3] == '=')
+                parse_cpu_archflags(&r[4]);
+            else
+                parse_cpu_archflags(argv[optind++]);
+            set_cpu = 1;
         } else 
 #ifdef USE_CODE_COPY
         if (!strcmp(r, "no-code-copy")) {

@@ -1043,6 +1056,8 @@ int main(int argc, char **argv)
     /* Scan interp_prefix dir for replacement files. */
     init_paths(interp_prefix);
 
+    if (!set_cpu)
+	parse_cpu_archflags(CPU_DEFAULT_ARCH);
     /* NOTE: we need to init the CPU at this stage to get
        qemu_host_page_size */
     env = cpu_init();

diff -u -p -r1.8 cpu.h
@@ -103,6 +103,20 @@ struct siginfo;
 int cpu_arm_signal_handler(int host_signum, struct siginfo *info, 
                            void *puc);
 
+#define NUM_CPU_ARCHES	10
+#define CPU_ARCH_4	(1 << 0)
+#define CPU_ARCH_T	(1 << 1)
+#define CPU_ARCH_5	(1 << 2)
+#define CPU_ARCH_5E	(1 << 3)
+#define CPU_ARCH_J	(1 << 4)
+#define CPU_ARCH_6	(1 << 5)
+#define CPU_ARCH_VFPs	(1 << 6)
+#define CPU_ARCH_VFPd	(1 << 7)
+#define CPU_ARCH_VFP2	(1 << 8)
+#define CPU_ARCH_FPA	(1 << 9)
+
+#define CPU_DEFAULT_ARCH "armv5te+fpa+vfp2"
+
 #define TARGET_PAGE_BITS 12
 #include "cpu-all.h"
 

156 lines not on this page · raw message

diff -u -p -r1.28 cpu.h
@@ -634,6 +634,9 @@ void cpu_x86_update_cr0(CPUX86State *env
 #define X86_DUMP_FPU  0x0001 /* dump FPU state too */
 #define X86_DUMP_CCOP 0x0002 /* dump qemu flag cache */
 
+#define NUM_CPU_ARCHES	1
+#define CPU_DEFAULT_ARCH "i686"
+
 #define TARGET_PAGE_BITS 12
 #include "cpu-all.h"
 

diff -u -p -r1.47 translate.c
@@ -29,6 +29,11 @@
 #include "exec-all.h"
 #include "disas.h"
 
+const struct cpu_arches cpu_arches[NUM_CPU_ARCHES] = 
+{
+    {"i686", 0}
+};
+
 /* XXX: move that elsewhere */
 static uint16_t *gen_opc_ptr;
 static uint32_t *gen_opparam_ptr;

diff -u -p -r1.16 cpu.h
@@ -193,6 +193,9 @@ uint32_t cpu_ppc_load_decr (CPUPPCState 
 void cpu_ppc_store_decr (CPUPPCState *env, uint32_t value);
 #endif
 
+#define NUM_CPU_ARCHES	1
+#define CPU_DEFAULT_ARCH "g3"
+
 #define TARGET_PAGE_BITS 12
 #include "cpu-all.h"
 

diff -u -p -r1.28 translate.c
@@ -30,6 +30,11 @@
 //#define DO_SINGLE_STEP
 //#define PPC_DEBUG_DISAS
 
+const struct cpu_arches cpu_arches[NUM_CPU_ARCHES] = 
+{
+    {"g3", 0}
+};
+
 enum {
 #define DEF(s, n, copy_size) INDEX_op_ ## s,
 #include "opc.h"

diff -u -p -r1.16 cpu.h
@@ -195,6 +195,9 @@ void cpu_set_cwp(CPUSPARCState *env1, in
 struct siginfo;
 int cpu_sparc_signal_handler(int hostsignum, struct siginfo *info, void *puc);
 
+#define NUM_CPU_ARCHES	1
+#define CPU_DEFAULT_ARCH "sparc"
+
 #define TARGET_PAGE_BITS 12 /* 4k */
 #include "cpu-all.h"
 

diff -u -p -r1.19 translate.c
@@ -42,6 +42,11 @@
 
 #define DEBUG_DISAS
 
+const struct cpu_arches cpu_arches[NUM_CPU_ARCHES] = 
+{
+    {"sparc", 0}
+};
+
 #define DYNAMIC_PC  1 /* dynamic pc value */
 #define JUMP_PC     2 /* dynamic pc value which takes only two values
                          according to jump_pc[T2] */