Implement Ali's review feedback.

Try to decrease indentation, and remove some redundant FullSystem checks.

2 files changed, 25 insertions, 25 deletions

diff --git a/src/cpu/o3/dyn_inst_impl.hh b/src/cpu/o3/dyn_inst_impl.hh
index 93ae83441..76a456ee3 100644
--- a/src/cpu/o3/dyn_inst_impl.hh
+++ b/src/cpu/o3/dyn_inst_impl.hh
@@ -193,18 +193,17 @@ template <class Impl>
 void
 BaseO3DynInst<Impl>::syscall(int64_t callnum)
 {
-    if (FullSystem) {
+    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);
-        }
+
+    // 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);
     }
 }
 
diff --git a/src/cpu/o3/thread_state.hh b/src/cpu/o3/thread_state.hh
index fc54ec33c..9273b00da 100644
--- a/src/cpu/o3/thread_state.hh
+++ b/src/cpu/o3/thread_state.hh
@@ -75,22 +75,23 @@ struct O3ThreadState : public ThreadState {
         : ThreadState(_cpu, _thread_num, _process),
           cpu(_cpu), inSyscall(0), trapPending(0)
     {
-        if (FullSystem) {
-            if (cpu->params()->profile) {
-                profile = new FunctionProfile(
-                        cpu->params()->system->kernelSymtab);
-                Callback *cb =
-                    new MakeCallback<O3ThreadState,
-                    &O3ThreadState::dumpFuncProfile>(this);
-                registerExitCallback(cb);
-            }
+        if (!FullSystem)
+            return;
 
-            // let's fill with a dummy node for now so we don't get a segfault
-            // on the first cycle when there's no node available.
-            static ProfileNode dummyNode;
-            profileNode = &dummyNode;
-            profilePC = 3;
+        if (cpu->params()->profile) {
+            profile = new FunctionProfile(
+                    cpu->params()->system->kernelSymtab);
+            Callback *cb =
+                new MakeCallback<O3ThreadState,
+                &O3ThreadState::dumpFuncProfile>(this);
+            registerExitCallback(cb);
         }
+
+        // let's fill with a dummy node for now so we don't get a segfault
+        // on the first cycle when there's no node available.
+        static ProfileNode dummyNode;
+        profileNode = &dummyNode;
+        profilePC = 3;
     }
 
     /** Pointer to the ThreadContext of this thread. */