diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2012-05-10 18:04:27 -0500 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2012-05-10 18:04:27 -0500 |
| commit | d9b484b41a96201f58711e3f96616842a960997e (patch) | |
| tree | 789bad34bf509e58a15ce4224ae7f105d9045d7e /src/dev | |
| parent | 574566550941aec56611f79d589bb4200b4b5b48 (diff) | |
| download | gem5-d9b484b41a96201f58711e3f96616842a960997e.tar.xz | |
ARM: Fix incorrect use of not operators in arm devices
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/arm/rtc_pl031.cc | 2 | ||||
| -rw-r--r-- | src/dev/arm/timer_cpulocal.cc | 4 | ||||
| -rw-r--r-- | src/dev/arm/timer_sp804.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/dev/arm/rtc_pl031.cc b/src/dev/arm/rtc_pl031.cc index 8896b16eb..99436c280 100644 --- a/src/dev/arm/rtc_pl031.cc +++ b/src/dev/arm/rtc_pl031.cc @@ -191,7 +191,7 @@ PL031::counterMatch() rawInt = true; bool old_pending = pendingInt; pendingInt = maskInt & rawInt; - if (pendingInt && ~old_pending) { + if (pendingInt && !old_pending) { DPRINTF(Timer, "-- Causing interrupt\n"); gic->sendInt(intNum); } diff --git a/src/dev/arm/timer_cpulocal.cc b/src/dev/arm/timer_cpulocal.cc index a3a126f2f..97d3c5883 100644 --- a/src/dev/arm/timer_cpulocal.cc +++ b/src/dev/arm/timer_cpulocal.cc @@ -291,7 +291,7 @@ CpuLocalTimer::Timer::timerAtZero() bool old_pending = pendingIntTimer; if (timerControl.intEnable) pendingIntTimer = true; - if (pendingIntTimer && ~old_pending) { + if (pendingIntTimer && !old_pending) { DPRINTF(Timer, "-- Causing interrupt\n"); parent->gic->sendPPInt(intNumTimer, cpuNum); } @@ -322,7 +322,7 @@ CpuLocalTimer::Timer::watchdogAtZero() //XXX: Should we ever support a true watchdog reset? } - if (pendingIntWatchdog && ~old_pending) { + if (pendingIntWatchdog && !old_pending) { DPRINTF(Timer, "-- Causing interrupt\n"); parent->gic->sendPPInt(intNumWatchdog, cpuNum); } diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc index 323597a98..407f35b60 100644 --- a/src/dev/arm/timer_sp804.cc +++ b/src/dev/arm/timer_sp804.cc @@ -205,7 +205,7 @@ Sp804::Timer::counterAtZero() bool old_pending = pendingInt; if (control.intEnable) pendingInt = true; - if (pendingInt && ~old_pending) { + if (pendingInt && !old_pending) { DPRINTF(Timer, "-- Causing interrupt\n"); parent->gic->sendInt(intNum); } |