diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2013-01-15 14:23:32 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-01-15 14:49:45 -0600 |
| commit | f6c5d1fd76e81aad0b75492803ebd00fd4e056ec (patch) | |
| tree | ec75f9e450ea668b524eb3f914e0af8feff6229d | |
| parent | f0036f0c657e090d38b58b8cd95b4ddde1d55b33 (diff) | |
| download | talos-hostboot-f6c5d1fd76e81aad0b75492803ebd00fd4e056ec.tar.gz talos-hostboot-f6c5d1fd76e81aad0b75492803ebd00fd4e056ec.zip | |
Allow trace magic instrs to succeed when fsp-trace missing.
The PHYP environment does not have the fsp-trace executable in
their environment and so the magic instruction handlers for
continuous trace were failing. Allow the fsp-trace invocation
to succeed by running 'fsp-trace || true'. The side effect is
that tracMERG will be empty if there really is an issue with
fsp-trace.
Change-Id: I5bef846591252fd63500b354768c8a23f29ff9ec
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2932
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rwxr-xr-x | src/build/debug/simics-debug-framework.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py index 2e7958438..4e868d725 100755 --- a/src/build/debug/simics-debug-framework.py +++ b/src/build/debug/simics-debug-framework.py @@ -6,7 +6,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2012 +# COPYRIGHT International Business Machines Corp. 2011,2013 # # p1 # @@ -511,7 +511,7 @@ def magic_instruction_callback(user_arg, cpu, arg): # tracMERG. Once we extract the trace buffer, we need to reset # mailbox scratch 1 (to 0) so that the trace daemon knows it can # continue. - saveCommand = "(system_cmp0.phys_mem)->map[0][1]->image.save tracBINARY 0x%x %d ; (shell \"fsp-trace ./ -s %s/hbotStringFile >> tracMERG 2>/dev/null\"); p8Proc0.proc_fsi2host_mbox->regs[95][1] = 0"%(hb_tracBinaryBuffer,hb_tracBinaryBufferSz,os.environ['HB_TOOLPATH']) + saveCommand = "(system_cmp0.phys_mem)->map[0][1]->image.save tracBINARY 0x%x %d ; (shell \"(fsp-trace ./ -s %s/hbotStringFile >> tracMERG 2>/dev/null) || true\"); p8Proc0.proc_fsi2host_mbox->regs[95][1] = 0"%(hb_tracBinaryBuffer,hb_tracBinaryBufferSz,os.environ['HB_TOOLPATH']) SIM_run_alone(run_command, saveCommand ) # Continuous trace: Clear these files. |
