CRIS: Fix remaining build warnings.

[qemu] / target-cris / exec.h

diff --git a/target-cris/exec.h b/target-cris/exec.h
index ec7346a..77e4240 100644 (file)
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 #include "dyngen-exec.h"
 
@@ -25,8 +25,6 @@ register struct CPUCRISState *env asm(AREG0);
 #include "cpu.h"
 #include "exec-all.h"
 
-#define RETURN() __asm__ __volatile__("" : : : "memory");
-
 static inline void env_to_regs(void)
 {
 }
@@ -35,9 +33,6 @@ static inline void regs_to_env(void)
 {
 }
 
-int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
-                              int mmu_idx, int is_softmmu);
-
 #if !defined(CONFIG_USER_ONLY)
 #include "softmmu_exec.h"
 #endif
@@ -48,7 +43,10 @@ void helper_movec(CPUCRISState *env, int reg, uint32_t val);
 static inline int cpu_halted(CPUState *env) {
        if (!env->halted)
                return 0;
-       if (env->interrupt_request & CPU_INTERRUPT_HARD) {
+
+       /* IRQ, NMI and GURU execeptions wakes us up.  */
+       if (env->interrupt_request
+           & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) {
                env->halted = 0;
                return 0;
        }