diff options
| author |   bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-11-26 10:29:22 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-11-26 10:29:22 +0000 |
| commit | 98699967b8f49bb0537aab882242b2045bdb05fc (patch) | |
| tree | 4cd8702fe68496be191ab74c71ed2bde4de4c685 | |
| parent | PS2 mouse and keyboard separation (Paul Brook) (diff) | |
| download | qemu-kvm-98699967b8f49bb0537aab882242b2045bdb05fc.tar.gz qemu-kvm-98699967b8f49bb0537aab882242b2045bdb05fc.tar.bz2 qemu-kvm-98699967b8f49bb0537aab882242b2045bdb05fc.zip | |
use TARGET_PAGE_SIZE (Paul Brook)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1659 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | cpu-all.h | 4 | ||||
| -rw-r--r-- | softmmu_template.h | 8 |
2 files changed, 7 insertions, 5 deletions
@@ -733,6 +733,8 @@ extern int code_copy_enabled; #define CPU_INTERRUPT_HARD 0x02 /* hardware interrupt pending */ #define CPU_INTERRUPT_EXITTB 0x04 /* exit the current TB (use for x86 a20 case) */ #define CPU_INTERRUPT_TIMER 0x08 /* internal timer exception pending */ +#define CPU_INTERRUPT_FIQ 0x10 /* Fast interrupt pending. */ + void cpu_interrupt(CPUState *s, int mask); void cpu_reset_interrupt(CPUState *env, int mask); @@ -790,9 +792,9 @@ extern uint8_t *phys_ram_base; extern uint8_t *phys_ram_dirty; /* physical memory access */ -#define IO_MEM_NB_ENTRIES 256 #define TLB_INVALID_MASK (1 << 3) #define IO_MEM_SHIFT 4 +#define IO_MEM_NB_ENTRIES (1 << (TARGET_PAGE_BITS - IO_MEM_SHIFT)) #define IO_MEM_RAM (0 << IO_MEM_SHIFT) /* hardcoded offset */ #define IO_MEM_ROM (1 << IO_MEM_SHIFT) /* hardcoded offset */ diff --git a/softmmu_template.h b/softmmu_template.h index 558bb8be8..a99bedf48 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -91,7 +91,7 @@ DATA_TYPE REGPARM(1) glue(glue(__ld, SUFFIX), MMUSUFFIX)(target_ulong addr, if ((addr & (DATA_SIZE - 1)) != 0) goto do_unaligned_access; res = glue(io_read, SUFFIX)(physaddr, tlb_addr); - } else if (((addr & 0xfff) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { + } else if (((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { /* slow unaligned access (it spans two pages or IO) */ do_unaligned_access: retaddr = GETPC(); @@ -130,7 +130,7 @@ static DATA_TYPE glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(target_ulong addr, if ((addr & (DATA_SIZE - 1)) != 0) goto do_unaligned_access; res = glue(io_read, SUFFIX)(physaddr, tlb_addr); - } else if (((addr & 0xfff) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { + } else if (((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { do_unaligned_access: /* slow unaligned access (it spans two pages) */ addr1 = addr & ~(DATA_SIZE - 1); @@ -208,7 +208,7 @@ void REGPARM(2) glue(glue(__st, SUFFIX), MMUSUFFIX)(target_ulong addr, goto do_unaligned_access; retaddr = GETPC(); glue(io_write, SUFFIX)(physaddr, val, tlb_addr, retaddr); - } else if (((addr & 0xfff) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { + } else if (((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { do_unaligned_access: retaddr = GETPC(); glue(glue(slow_st, SUFFIX), MMUSUFFIX)(addr, val, @@ -245,7 +245,7 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(target_ulong addr, if ((addr & (DATA_SIZE - 1)) != 0) goto do_unaligned_access; glue(io_write, SUFFIX)(physaddr, val, tlb_addr, retaddr); - } else if (((addr & 0xfff) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { + } else if (((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { do_unaligned_access: /* XXX: not efficient, but simple */ for(i = 0;i < DATA_SIZE; i++) { |