From a88f01c2002bd670f124c5a39b018813d18443c0 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 1 Aug 2007 15:40:41 -0700 Subject: Statetrace: Make sure all the info block strings are printed. --HG-- extra : convert_revision : 534b4f5cee3fd1a6d3638d9a910d22ad1aa81fde --- util/statetrace/arch/tracechild_amd64.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'util') diff --git a/util/statetrace/arch/tracechild_amd64.cc b/util/statetrace/arch/tracechild_amd64.cc index 088e547e4..222923972 100644 --- a/util/statetrace/arch/tracechild_amd64.cc +++ b/util/statetrace/arch/tracechild_amd64.cc @@ -160,6 +160,7 @@ ostream & AMD64TraceChild::outputStartState(ostream & os) { uint64_t sp = getSP(); uint64_t pc = getPC(); + uint64_t highestInfo = 0; char obuf[1024]; sprintf(obuf, "Initial stack pointer = 0x%016llx\n", sp); os << obuf; @@ -180,6 +181,9 @@ ostream & AMD64TraceChild::outputStartState(ostream & os) cargv = ptrace(PTRACE_PEEKDATA, pid, sp, 0); sprintf(obuf, "0x%016llx: argv[%d] = 0x%016llx\n", sp, argCount++, cargv); + if(cargv) + if(highestInfo < cargv) + highestInfo = cargv; os << obuf; sp += 8; } while(cargv); @@ -230,7 +234,7 @@ ostream & AMD64TraceChild::outputStartState(ostream & os) } sp += 8; clearedInitialPadding = clearedInitialPadding || buf != 0; - } while(!clearedInitialPadding || buf != 0); + } while(!clearedInitialPadding || buf != 0 || sp <= highestInfo); return os; } -- cgit v1.2.3