summaryrefslogtreecommitdiff
path: root/sim/pseudo_inst.hh
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-03-01 12:43:04 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-03-01 12:43:04 -0500
commit1624d9e5458fbd02d2e21c6d88f78769680b78b0 (patch)
tree925cf2497d6c440e2b764bb7bda4a049580c7481 /sim/pseudo_inst.hh
parent34da58a698e4119876f04d13c337e9974970f49a (diff)
parent26d7b5a4d1ee06ce314093facdbef6389ee1ec55 (diff)
downloadgem5-1624d9e5458fbd02d2e21c6d88f78769680b78b0.tar.xz
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.q --HG-- extra : convert_revision : 4855ecfb3de652456a8be413c9e538c91709dcb6
Diffstat (limited to 'sim/pseudo_inst.hh')
-rw-r--r--sim/pseudo_inst.hh5
1 files changed, 4 insertions, 1 deletions
diff --git a/sim/pseudo_inst.hh b/sim/pseudo_inst.hh
index 3857f2050..4dd427c99 100644
--- a/sim/pseudo_inst.hh
+++ b/sim/pseudo_inst.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003-2005 The Regents of The University of Michigan
+ * Copyright (c) 2003-2006 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,9 @@ namespace AlphaPseudo
void arm(ExecContext *xc);
void quiesce(ExecContext *xc);
+ void quiesceNs(ExecContext *xc, uint64_t ns);
+ void quiesceCycles(ExecContext *xc, uint64_t cycles);
+ uint64_t quiesceTime(ExecContext *xc);
void ivlb(ExecContext *xc);
void ivle(ExecContext *xc);
void m5exit(ExecContext *xc, Tick delay);