Commit bb7ec043 authored by Paul Brook's avatar Paul Brook
Browse files

m68k mmap2 fixes. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4106 c046a42c-6fe2-441c-8c8c-71466251a162
parent bdf46ea2

linux-user/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1763,7 +1763,7 @@ void cpu_loop(CPUM68KState *env) 
                                          env->dregs[3],

                                          env->dregs[4],

                                          env->dregs[5],

                                          env->dregs[6]);

                                          env->aregs[0]);

            }

            break;

        case EXCP_INTERRUPT:

linux-user/syscall.c

+1 −3
Original line number Diff line number Diff line
@@ -4086,10 +4086,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
#endif

#ifdef TARGET_NR_mmap2

    case TARGET_NR_mmap2:

#if defined(TARGET_SPARC) || defined(TARGET_MIPS)

#ifndef MMAP_SHIFT

#define MMAP_SHIFT 12

#else

#define MMAP_SHIFT TARGET_PAGE_BITS

#endif

        ret = get_errno(target_mmap(arg1, arg2, arg3,

                                    target_to_host_bitmask(arg4, mmap_flags_tbl),

target-cris/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ void register_cris_insns (CPUCRISState *env); 


/* CRIS uses 8k pages.  */

#define TARGET_PAGE_BITS 13

#define MMAP_SHIFT TARGET_PAGE_BITS



#define CPUState CPUCRISState

#define cpu_init cpu_cris_init