linux-user/main.c (m68k): Use get_user_u16 rather than lduw in cpu_loop
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 20 Jan 2015 15:19:33 +0000 (15:19 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 20 Jan 2015 15:19:33 +0000 (15:19 +0000)
In the m68k cpu_loop() use get_user_u16 to read the immediate for
the simcall rahter than lduw, to bring it into line with how other
archs do it and to remove another user of the ldl family of functions.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1421334118-3287-8-git-send-email-peter.maydell@linaro.org

linux-user/main.c

index ac39ff5493da4c0331c0d94494819ac8248e8ab2..8c70be4c1bab7b998ac6f9ae2589ed06570899ac 100644 (file)
@@ -2972,7 +2972,7 @@ void cpu_loop(CPUM68KState *env)
             {
                 if (ts->sim_syscalls) {
                     uint16_t nr;
-                    nr = lduw(env->pc + 2);
+                    get_user_u16(nr, env->pc + 2);
                     env->pc += 4;
                     do_m68k_simcall(env, nr);
                 } else {