gwj / at91sam9263 · Commits

Commit 09683d35974f3d91cf018deed20346d255deae9b

Authored by bellard
1 parent 590b7eed

changed cpu_x86_in/out to cpu_in/out 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@532 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 17 additions and 0 deletions
cpu-all.h
  View file @09683d3
@@ -420,6 +420,7 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size); @@ -420,6 +420,7 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size);
420 #define cpu_gen_code cpu_x86_gen_code 420 #define cpu_gen_code cpu_x86_gen_code
421 #define cpu_interrupt cpu_x86_interrupt 421 #define cpu_interrupt cpu_x86_interrupt
422 #define cpu_signal_handler cpu_x86_signal_handler 422 #define cpu_signal_handler cpu_x86_signal_handler
  423 +#define cpu_dump_state cpu_x86_dump_state
423 424
424 #elif defined(TARGET_ARM) 425 #elif defined(TARGET_ARM)
425 426
@@ -429,6 +430,7 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size); @@ -429,6 +430,7 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size);
429 #define cpu_gen_code cpu_arm_gen_code 430 #define cpu_gen_code cpu_arm_gen_code
430 #define cpu_interrupt cpu_arm_interrupt 431 #define cpu_interrupt cpu_arm_interrupt
431 #define cpu_signal_handler cpu_arm_signal_handler 432 #define cpu_signal_handler cpu_arm_signal_handler
  433 +#define cpu_dump_state cpu_arm_dump_state
432 434
433 #elif defined(TARGET_SPARC) 435 #elif defined(TARGET_SPARC)
434 436
@@ -438,6 +440,7 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size); @@ -438,6 +440,7 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size);
438 #define cpu_gen_code cpu_sparc_gen_code 440 #define cpu_gen_code cpu_sparc_gen_code
439 #define cpu_interrupt cpu_sparc_interrupt 441 #define cpu_interrupt cpu_sparc_interrupt
440 #define cpu_signal_handler cpu_sparc_signal_handler 442 #define cpu_signal_handler cpu_sparc_signal_handler
  443 +#define cpu_dump_state cpu_sparc_dump_state
441 444
442 #elif defined(TARGET_PPC) 445 #elif defined(TARGET_PPC)
443 446
@@ -447,6 +450,7 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size); @@ -447,6 +450,7 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size);
447 #define cpu_gen_code cpu_ppc_gen_code 450 #define cpu_gen_code cpu_ppc_gen_code
448 #define cpu_interrupt cpu_ppc_interrupt 451 #define cpu_interrupt cpu_ppc_interrupt
449 #define cpu_signal_handler cpu_ppc_signal_handler 452 #define cpu_signal_handler cpu_ppc_signal_handler
  453 +#define cpu_dump_state cpu_ppc_dump_state
450 454
451 #else 455 #else
452 456
@@ -473,6 +477,19 @@ void cpu_single_step(CPUState *env, int enabled); @@ -473,6 +477,19 @@ void cpu_single_step(CPUState *env, int enabled);
473 void cpu_set_log(int log_flags); 477 void cpu_set_log(int log_flags);
474 void cpu_set_log_filename(const char *filename); 478 void cpu_set_log_filename(const char *filename);
475 479
  480 +/* IO ports API */
  481 +
  482 +/* NOTE: as these functions may be even used when there is an isa
  483 + brige on non x86 targets, we always defined them */
  484 +#ifndef NO_CPU_IO_DEFS
  485 +void cpu_outb(CPUState *env, int addr, int val);
  486 +void cpu_outw(CPUState *env, int addr, int val);
  487 +void cpu_outl(CPUState *env, int addr, int val);
  488 +int cpu_inb(CPUState *env, int addr);
  489 +int cpu_inw(CPUState *env, int addr);
  490 +int cpu_inl(CPUState *env, int addr);
  491 +#endif
  492 +
476 /* memory API */ 493 /* memory API */
477 494
478 extern int phys_ram_size; 495 extern int phys_ram_size;