2c2
< * Copyright (c) 2010-2011 ARM Limited
---
> * Copyright (c) 2010 ARM Limited
44d43
< #include "config/use_checker.hh"
45a45
> #include "sim/full_system.hh"
140,144d139
< #if USE_CHECKER
< if (this->isStoreConditional()) {
< this->reqToVerify->setExtraData(pkt->req->getExtraData());
< }
< #endif
152d146
< #if FULL_SYSTEM
197d190
< #endif
203,213c196,207
< #if FULL_SYSTEM
< panic("Syscall emulation isn't available in FS mode.\n");
< #else
< // HACK: check CPU's nextPC before and after syscall. If it
< // changes, update this instruction's nextPC because the syscall
< // must have changed the nextPC.
< TheISA::PCState curPC = this->cpu->pcState(this->threadNumber);
< this->cpu->syscall(callnum, this->threadNumber);
< TheISA::PCState newPC = this->cpu->pcState(this->threadNumber);
< if (!(curPC == newPC)) {
< this->pcState(newPC);
---
> if (FullSystem) {
> panic("Syscall emulation isn't available in FS mode.\n");
> } else {
> // HACK: check CPU's nextPC before and after syscall. If it
> // changes, update this instruction's nextPC because the syscall
> // must have changed the nextPC.
> TheISA::PCState curPC = this->cpu->pcState(this->threadNumber);
> this->cpu->syscall(callnum, this->threadNumber);
> TheISA::PCState newPC = this->cpu->pcState(this->threadNumber);
> if (!(curPC == newPC)) {
> this->pcState(newPC);
> }
215d208
< #endif