[m5-dev] encumbered: Replace curTick global variable with accessor functi...

[Steve Reinhardt]

changeset 01c540be7e72 in /z/repo/encumbered
details: http://repo.m5sim.org/encumbered?cmd=changeset;node=01c540be7e72
summary: Replace curTick global variable with accessor functions.

diffstat:

 eio/eio.cc |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (79 lines):

diff --git a/eio/eio.cc b/eio/eio.cc
--- a/eio/eio.cc
+++ b/eio/eio.cc
@@ -459,19 +459,19 @@
 
        if (!regrec || regrec->ec != ec_address) {
            ccprintf(cerr, "icount=%d, cycle=%d\n",
-                    icnt, curTick);
+                    icnt, curTick());
            fatal("%s: EIO trace inconsistency: missing input reg", name());
        }
 
        if (MD_EXO_CMP_IREG(regrec, tc, i)) {
-           ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick);
+           ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick());
            fatal("%s: EIO trace inconsistency: R[%d] input mismatch", name(),
                  i);
        }
     }
 
     if (regrec != NULL) {
-       ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick);
+       ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick());
        fatal("%s: EIO trace inconsistency: too many input regs", name());
     }
 
@@ -488,7 +488,7 @@
            || addr->ec != ec_address || !(blob = addr->next)
            || blob->ec != ec_blob || blob->next != NULL)
        {
-           ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick);
+           ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick());
            fatal("%s: EIO trace inconsistency: bad memory transaction",
                  name());
        }
@@ -501,7 +501,7 @@
            memPort->readBlob(loc, &val, sizeof(unsigned char));
 
            if (val != blob->as_blob.data[i]) {
-               ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick);
+               ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick());
                fatal("%s: EIO trace inconsistency: "
                      "addr 0x%08p input mismatch", name(), loc);
            }
@@ -528,7 +528,7 @@
     /* adjust breakpoint */
     brkrec = exo_outregs->as_list.head;
     if (!brkrec || brkrec->ec != ec_address) {
-       ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick);
+       ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick());
        fatal("%s: EIO trace inconsistency: missing memory breakpoint",
              name());
     }
@@ -544,14 +544,14 @@
     for (i = MD_FIRST_OUT_REG, regrec = exo_outregs->as_list.head->next;
         i <= MD_LAST_OUT_REG; i++, regrec = regrec->next) {
        if (!regrec || regrec->ec != ec_address) {
-           ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick);
+           ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick());
            fatal("%s: EIO trace inconsistency: missing output reg", name());
        }
 
        MD_EXO_TO_IREG(regrec, tc, i);
     }
     if (regrec != NULL) {
-       ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick);
+       ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick());
        fatal("%s: EIO trace inconsistency: too many output regs", name());
     }
 
@@ -565,7 +565,7 @@
            || addr->ec != ec_address || !(blob = addr->next)
            || blob->ec != ec_blob || blob->next != NULL)
        {
-           ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick);
+           ccprintf(cerr, "icount=%d, cycle=%d\n", icnt, curTick());
            fatal("%s: EIO trace icnonsistency: bad memory transaction",
                  name());
        }
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev