From 5592798865ece858bab2b444bc782d19121e2566 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sat, 6 Feb 2016 17:21:19 -0800 Subject: style: fix missing spaces in control statements Result of running 'hg m5style --skip-all --fix-control -a'. --- util/statetrace/arch/amd64/tracechild.cc | 10 +++++----- util/statetrace/arch/arm/tracechild.cc | 12 ++++++------ util/statetrace/arch/sparc/tracechild.cc | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'util/statetrace') diff --git a/util/statetrace/arch/amd64/tracechild.cc b/util/statetrace/arch/amd64/tracechild.cc index 1aec5ec97..d3f3886d1 100644 --- a/util/statetrace/arch/amd64/tracechild.cc +++ b/util/statetrace/arch/amd64/tracechild.cc @@ -271,7 +271,7 @@ AMD64TraceChild::outputStartState(ostream & os) highestInfo = cargv; os << obuf; sp += 8; - } while(cargv); + } while (cargv); //Output the envp pointers int envCount = 0; @@ -282,7 +282,7 @@ AMD64TraceChild::outputStartState(ostream & os) sp, envCount++, cenvp); os << obuf; sp += 8; - } while(cenvp); + } while (cenvp); uint64_t auxType, auxVal; do { auxType = ptrace(PTRACE_PEEKDATA, pid, sp, 0); @@ -292,7 +292,7 @@ AMD64TraceChild::outputStartState(ostream & os) sprintf(obuf, "0x%016lx: Auxiliary vector = {0x%016lx, 0x%016lx}\n", sp - 16, auxType, auxVal); os << obuf; - } while(auxType != 0 || auxVal != 0); + } while (auxType != 0 || auxVal != 0); //Print out the argument strings, environment strings, and file name. string current; uint64_t buf; @@ -329,7 +329,7 @@ AMD64TraceChild::findSyscall() for (int i = 0; i < sizeof(uint64_t); i++) { unsigned char byte = buf & 0xFF; if (!foundOpcode) { - if(!(byte == 0x66 || //operand override + if (!(byte == 0x66 || //operand override byte == 0x67 || //address override byte == 0x2E || //cs byte == 0x3E || //ds @@ -395,7 +395,7 @@ AMD64TraceChild::step() do { ptraceSingleStep(); newPC = getPC(); - } while(newPC == origPC); + } while (newPC == origPC); } } diff --git a/util/statetrace/arch/arm/tracechild.cc b/util/statetrace/arch/arm/tracechild.cc index 79670bc8b..d331a851e 100644 --- a/util/statetrace/arch/arm/tracechild.cc +++ b/util/statetrace/arch/arm/tracechild.cc @@ -183,12 +183,12 @@ ARMTraceChild::outputStartState(ostream & os) cargv = ptrace(PTRACE_PEEKDATA, pid, sp, 0); sprintf(obuf, "0x%08x: argv[%d] = 0x%08x\n", sp, argCount++, cargv); - if(cargv) - if(highestInfo < cargv) + if (cargv) + if (highestInfo < cargv) highestInfo = cargv; os << obuf; sp += 4; - } while(cargv); + } while (cargv); //Output the envp pointers int envCount = 0; @@ -199,7 +199,7 @@ ARMTraceChild::outputStartState(ostream & os) sp, envCount++, cenvp); os << obuf; sp += 4; - } while(cenvp); + } while (cenvp); uint32_t auxType, auxVal; do { auxType = ptrace(PTRACE_PEEKDATA, pid, sp, 0); @@ -209,7 +209,7 @@ ARMTraceChild::outputStartState(ostream & os) sprintf(obuf, "0x%08x: Auxiliary vector = {0x%08x, 0x%08x}\n", sp - 8, auxType, auxVal); os << obuf; - } while(auxType != 0 || auxVal != 0); + } while (auxType != 0 || auxVal != 0); //Print out the argument strings, environment strings, and file name. string current; uint32_t buf; @@ -231,7 +231,7 @@ ARMTraceChild::outputStartState(ostream & os) } sp += 4; clearedInitialPadding = clearedInitialPadding || buf != 0; - } while(!clearedInitialPadding || buf != 0 || sp <= highestInfo); + } while (!clearedInitialPadding || buf != 0 || sp <= highestInfo); return os; } diff --git a/util/statetrace/arch/sparc/tracechild.cc b/util/statetrace/arch/sparc/tracechild.cc index fad4a00d7..dc6017a9f 100644 --- a/util/statetrace/arch/sparc/tracechild.cc +++ b/util/statetrace/arch/sparc/tracechild.cc @@ -230,7 +230,7 @@ SparcTraceChild::getTargets(uint32_t inst, uint64_t pc, uint64_t npc, target1 = npc; target2 = npc + 4; return 2; - } else if(ba) { + } else if (ba) { //This branches immediately to the effective address of the branch //which we'll have to calculate. uint64_t disp = 0; @@ -249,7 +249,7 @@ SparcTraceChild::getTargets(uint32_t inst, uint64_t pc, uint64_t npc, //smart enough to turn this into a shift. disp *= 4; target1 = pc + disp; - } else if(bn) + } else if (bn) target1 = npc + 4; else target1 = npc; @@ -416,7 +416,7 @@ SparcTraceChild::outputStartState(ostream & os) sp, argCount++, cargv); os << obuf; sp += v8 ? 4 : 8; - } while(cargv); + } while (cargv); //Output the envp pointers int envCount = 0; uint64_t cenvp; -- cgit v1.2.3