m68k mmap2 fixes.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4106 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2008-03-25 22:28:25 +00:00
parent bdf46ea256
commit bb7ec0437a
3 changed files with 3 additions and 4 deletions

View file

@ -1763,7 +1763,7 @@ void cpu_loop(CPUM68KState *env)
env->dregs[3], env->dregs[3],
env->dregs[4], env->dregs[4],
env->dregs[5], env->dregs[5],
env->dregs[6]); env->aregs[0]);
} }
break; break;
case EXCP_INTERRUPT: case EXCP_INTERRUPT:

View file

@ -4086,10 +4086,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#endif #endif
#ifdef TARGET_NR_mmap2 #ifdef TARGET_NR_mmap2
case TARGET_NR_mmap2: case TARGET_NR_mmap2:
#if defined(TARGET_SPARC) || defined(TARGET_MIPS) #ifndef MMAP_SHIFT
#define MMAP_SHIFT 12 #define MMAP_SHIFT 12
#else
#define MMAP_SHIFT TARGET_PAGE_BITS
#endif #endif
ret = get_errno(target_mmap(arg1, arg2, arg3, ret = get_errno(target_mmap(arg1, arg2, arg3,
target_to_host_bitmask(arg4, mmap_flags_tbl), target_to_host_bitmask(arg4, mmap_flags_tbl),

View file

@ -213,6 +213,7 @@ void register_cris_insns (CPUCRISState *env);
/* CRIS uses 8k pages. */ /* CRIS uses 8k pages. */
#define TARGET_PAGE_BITS 13 #define TARGET_PAGE_BITS 13
#define MMAP_SHIFT TARGET_PAGE_BITS
#define CPUState CPUCRISState #define CPUState CPUCRISState
#define cpu_init cpu_cris_init #define cpu_init cpu_cris_init