Discussion:
Valgrind: r16289 - in /branches/VALGRIND_JIT_HACKS: coregrind/m_gdbserver/m_gdbserver.c coregrind/m_translate.c memcheck/mc_translate.c
(too old to reply)
s***@valgrind.org
2017-03-29 21:58:56 UTC
Permalink
Raw Message
Author: iraisr
Date: Wed Mar 29 22:58:56 2017
New Revision: 16289

Log:
Necessary changes in coregrind and Memcheck after introducing ppIRTypeEnvDefd().

Modified:
branches/VALGRIND_JIT_HACKS/coregrind/m_gdbserver/m_gdbserver.c
branches/VALGRIND_JIT_HACKS/coregrind/m_translate.c
branches/VALGRIND_JIT_HACKS/memcheck/mc_translate.c

Modified: branches/VALGRIND_JIT_HACKS/coregrind/m_gdbserver/m_gdbserver.c
==============================================================================
--- branches/VALGRIND_JIT_HACKS/coregrind/m_gdbserver/m_gdbserver.c (original)
+++ branches/VALGRIND_JIT_HACKS/coregrind/m_gdbserver/m_gdbserver.c Wed Mar 29 22:58:56 2017
@@ -1283,7 +1283,7 @@
IRStmtVec* stmts_out = emptyIRStmtVec();
stmts_out->parent = parent;
stmts_out->id = stmts_in->id;
- stmts_out->def_set = deepCopyIRTempDefSet(stmts_in->def_set);
+ stmts_out->defset = deepCopyIRTempDefSet(stmts_in->defset);

for (UInt i = 0; i < stmts_in->stmts_used; i++) {
IRStmt* st = stmts_in->stmts[i];

Modified: branches/VALGRIND_JIT_HACKS/coregrind/m_translate.c
==============================================================================
--- branches/VALGRIND_JIT_HACKS/coregrind/m_translate.c (original)
+++ branches/VALGRIND_JIT_HACKS/coregrind/m_translate.c Wed Mar 29 22:58:56 2017
@@ -293,7 +293,7 @@
IRStmtVec* out = emptyIRStmtVec();
out->parent = parent;
out->id = stmts_in->id;
- out->def_set = deepCopyIRTempDefSet(stmts_in->def_set);
+ out->defset = deepCopyIRTempDefSet(stmts_in->defset);

delta = 0;


Modified: branches/VALGRIND_JIT_HACKS/memcheck/mc_translate.c
==============================================================================
--- branches/VALGRIND_JIT_HACKS/memcheck/mc_translate.c (original)
+++ branches/VALGRIND_JIT_HACKS/memcheck/mc_translate.c Wed Mar 29 22:58:56 2017
@@ -326,7 +326,7 @@
IRStmtVec* stmts_out = emptyIRStmtVec();
stmts_out->parent = (parent_mce != NULL) ? parent_mce->stmts : NULL;
stmts_out->id = stmts_in->id;
- stmts_out->def_set = deepCopyIRTempDefSet(stmts_in->def_set);
+ stmts_out->defset = deepCopyIRTempDefSet(stmts_in->defset);

mce->stmts = stmts_out;
mce->tyenv = tyenv;
@@ -464,7 +464,7 @@
static inline void stmt ( HChar cat, MCEnv* mce, IRStmt* st ) {
if (mce->settings->trace) {
VG_(printf)(" %c: ", cat);
- ppIRStmt(st);
+ ppIRStmt(st, mce->tyenv, 0);
VG_(printf)("\n");
}
addStmtToIRStmtVec(mce->stmts, st);
@@ -6445,7 +6445,7 @@
|| isBogusIRStmtVec(st->Ist.IfThenElse.else_leg);
default:
unhandled:
- ppIRStmt(st);
+ ppIRStmt(st, NULL, 0);
VG_(tool_panic)("isBogusIRStmt");
}
}
@@ -6458,7 +6458,7 @@
Bool bogus = isBogusIRStmt(st);
if (0 && bogus) {
VG_(printf)("bogus: ");
- ppIRStmt(st);
+ ppIRStmt(st, NULL, 0);
VG_(printf)("\n");
}
if (bogus) {
@@ -6480,7 +6480,7 @@

if (mce->settings->trace) {
VG_(printf)("\n");
- ppIRStmt_wrk(st, mce->depth);
+ ppIRStmt(st, mce->tyenv, mce->depth);
VG_(printf)("\n");
}

@@ -6579,7 +6579,7 @@

default:
VG_(printf)("\n");
- ppIRStmt(st);
+ ppIRStmt(st, mce->tyenv, 0);
VG_(printf)("\n");
VG_(tool_panic)("memcheck: unhandled IRStmt");

@@ -6587,7 +6587,7 @@

if (0 && mce->settings->trace) {
for (UInt j = first_stmt; j < mce->stmts->stmts_used; j++) {
- ppIRStmt_wrk(mce->stmts->stmts[j], mce->depth + 1);
+ ppIRStmt(mce->stmts->stmts[j], mce->tyenv, mce->depth + 1);
VG_(printf)("\n");
}
VG_(printf)("\n");
@@ -6745,7 +6745,7 @@

if (0 && verboze) {
for (UInt j = first_stmt; j < sb_out->stmts->stmts_used; j++) {
- ppIRStmt_wrk(sb_out->stmts->stmts[j], 1);
+ ppIRStmt(sb_out->stmts->stmts[j], sb_out->tyenv, 1);
VG_(printf)("\n");
}
VG_(printf)("\n");
@@ -7772,7 +7772,7 @@

default:
VG_(printf)("mc_translate.c: schemeS: unhandled: ");
- ppIRStmt(st);
+ ppIRStmt(st, mce->tyenv, 0);
VG_(tool_panic)("memcheck:schemeS");
}
}

Loading...