gwj / at91sam9263 · Commits

Commit 92ccca6aa801f1ddb8d35f3812357c24a502d682

Authored by bellard
1 parent dd3587f3

declare user mode only simulation for QEMU 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@265 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 8 additions and 1 deletions
linux-user/main.c
  View file @92ccca6
@@ -100,6 +100,11 @@ int cpu_x86_inl(CPUX86State *env, int addr) @@ -100,6 +100,11 @@ int cpu_x86_inl(CPUX86State *env, int addr)
100 return 0; 100 return 0;
101 } 101 }
102 102
  103 +int cpu_x86_get_pic_interrupt(CPUX86State *env)
  104 +{
  105 + return -1;
  106 +}
  107 +
103 static void write_dt(void *ptr, unsigned long addr, unsigned long limit, 108 static void write_dt(void *ptr, unsigned long addr, unsigned long limit,
104 int flags) 109 int flags)
105 { 110 {
@@ -395,7 +400,7 @@ int main(int argc, char **argv) @@ -395,7 +400,7 @@ int main(int argc, char **argv)
395 /* NOTE: we need to init the CPU at this stage to get the 400 /* NOTE: we need to init the CPU at this stage to get the
396 host_page_size */ 401 host_page_size */
397 env = cpu_init(); 402 env = cpu_init();
398 - 403 +
399 if (elf_exec(filename, argv+optind, environ, regs, info) != 0) { 404 if (elf_exec(filename, argv+optind, environ, regs, info) != 0) {
400 printf("Error loading %s\n", filename); 405 printf("Error loading %s\n", filename);
401 _exit(1); 406 _exit(1);
@@ -476,6 +481,8 @@ int main(int argc, char **argv) @@ -476,6 +481,8 @@ int main(int argc, char **argv)
476 cpu_x86_load_seg(env, R_SS, __USER_DS); 481 cpu_x86_load_seg(env, R_SS, __USER_DS);
477 cpu_x86_load_seg(env, R_FS, __USER_DS); 482 cpu_x86_load_seg(env, R_FS, __USER_DS);
478 cpu_x86_load_seg(env, R_GS, __USER_DS); 483 cpu_x86_load_seg(env, R_GS, __USER_DS);
  484 + env->user_mode_only = 1;
  485 +
479 #elif defined(TARGET_ARM) 486 #elif defined(TARGET_ARM)
480 { 487 {
481 int i; 488 int i;