summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-10-31 00:49:35 +0100
committerRichard Braun <rbraun@sceen.net>2017-10-31 00:49:35 +0100
commit3fc6079789f3a6c4b7fdb885bac7da2ffde11634 (patch)
treea72f4e4b0eb27dbd68f66e3acfa28302acd2e609
parent980ae3b7632039e5b4365f943b6e79df0c2b44f8 (diff)
Fix cpu_intr_enabled
-rw-r--r--arch/arm/machine/cpu.h2
-rwxr-xr-xtools/qemu_arm.sh2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/machine/cpu.h b/arch/arm/machine/cpu.h
index 13af39c6..c2124ad1 100644
--- a/arch/arm/machine/cpu.h
+++ b/arch/arm/machine/cpu.h
@@ -113,7 +113,7 @@ cpu_intr_enabled(void)
unsigned long cpsr;
cpsr = cpu_get_cpsr();
- return cpsr & CPU_PSR_I;
+ return !(cpsr & CPU_PSR_I);
}
void cpu_halt_broadcast(void);
diff --git a/tools/qemu_arm.sh b/tools/qemu_arm.sh
index 93cada10..9a69d0f1 100755
--- a/tools/qemu_arm.sh
+++ b/tools/qemu_arm.sh
@@ -18,8 +18,6 @@ dd if=/dev/zero of=$IMG bs=1M seek=64 count=0
dd if=$BIN of=$IMG conv=notrunc
$QEMU_EXE \
--d int \
--D debug.log \
-M virt-2.8 \
-ctrl-grab \
-gdb tcp::1234 \