gwj / at91sam9263 · Commits

Commit bb7ec0437a647c6734f65719f861d68a5281351d

Authored by pbrook
1 parent bdf46ea2

m68k mmap2 fixes. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4106 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 3 changed files with 3 additions and 4 deletions
linux-user/main.c
  View file @bb7ec04
... ... @@ -1763,7 +1763,7 @@ void cpu_loop(CPUM68KState *env)
1763 1763 env->dregs[3],
1764 1764 env->dregs[4],
1765 1765 env->dregs[5],
1766   - env->dregs[6]);
  1766 + env->aregs[0]);
1767 1767 }
1768 1768 break;
1769 1769 case EXCP_INTERRUPT:
... ...
linux-user/syscall.c
  View file @bb7ec04
... ... @@ -4086,10 +4086,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
4086 4086 #endif
4087 4087 #ifdef TARGET_NR_mmap2
4088 4088 case TARGET_NR_mmap2:
4089   -#if defined(TARGET_SPARC) || defined(TARGET_MIPS)
  4089 +#ifndef MMAP_SHIFT
4090 4090 #define MMAP_SHIFT 12
4091   -#else
4092   -#define MMAP_SHIFT TARGET_PAGE_BITS
4093 4091 #endif
4094 4092 ret = get_errno(target_mmap(arg1, arg2, arg3,
4095 4093 target_to_host_bitmask(arg4, mmap_flags_tbl),
... ...
target-cris/cpu.h
  View file @bb7ec04
... ... @@ -213,6 +213,7 @@ void register_cris_insns (CPUCRISState *env);
213 213  
214 214 /* CRIS uses 8k pages. */
215 215 #define TARGET_PAGE_BITS 13
  216 +#define MMAP_SHIFT TARGET_PAGE_BITS
216 217  
217 218 #define CPUState CPUCRISState
218 219 #define cpu_init cpu_cris_init
... ...