changeset ef46ec5373dd in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=ef46ec5373dd
description:
CLCD: Fix some serialization bugs with the clcd controller.
diffstat:
src/dev/arm/pl111.cc | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diffs (63 lines):
diff -r 08e91664adac -r ef46ec5373dd src/dev/arm/pl111.cc
--- a/src/dev/arm/pl111.cc Wed Feb 23 15:10:48 2011 -0600
+++ b/src/dev/arm/pl111.cc Wed Feb 23 15:10:48 2011 -0600
@@ -586,6 +586,29 @@
SERIALIZE_SCALAR(curAddr);
SERIALIZE_SCALAR(waterMark);
SERIALIZE_SCALAR(dmaPendingNum);
+
+ Tick int_event_time = 0;
+ Tick read_event_time = 0;
+ Tick fill_fifo_event_time = 0;
+
+ if (readEvent.scheduled())
+ read_event_time = readEvent.when();
+ if (fillFifoEvent.scheduled())
+ fill_fifo_event_time = fillFifoEvent.when();
+ if (intEvent.scheduled())
+ int_event_time = intEvent.when();
+
+ SERIALIZE_SCALAR(read_event_time);
+ SERIALIZE_SCALAR(fill_fifo_event_time);
+ SERIALIZE_SCALAR(int_event_time);
+
+ vector<Tick> dma_done_event_tick;
+ dma_done_event_tick.resize(maxOutstandingDma);
+ for (int x = 0; x < maxOutstandingDma; x++) {
+ dma_done_event_tick[x] = dmaDoneEvent[x].scheduled() ?
+ dmaDoneEvent[x].when() : 0;
+ }
+ arrayParamOut(os, "dma_done_event_tick", dma_done_event_tick);
}
void
@@ -667,6 +690,29 @@
UNSERIALIZE_SCALAR(waterMark);
UNSERIALIZE_SCALAR(dmaPendingNum);
+ Tick int_event_time = 0;
+ Tick read_event_time = 0;
+ Tick fill_fifo_event_time = 0;
+
+ UNSERIALIZE_SCALAR(read_event_time);
+ UNSERIALIZE_SCALAR(fill_fifo_event_time);
+ UNSERIALIZE_SCALAR(int_event_time);
+
+ if (int_event_time)
+ schedule(intEvent, int_event_time);
+ if (read_event_time)
+ schedule(readEvent, read_event_time);
+ if (fill_fifo_event_time)
+ schedule(fillFifoEvent, fill_fifo_event_time);
+
+ vector<Tick> dma_done_event_tick;
+ dma_done_event_tick.resize(maxOutstandingDma);
+ arrayParamIn(cp, section, "dma_done_event_tick", dma_done_event_tick);
+ for (int x = 0; x < maxOutstandingDma; x++) {
+ if (dma_done_event_tick[x])
+ schedule(dmaDoneEvent[x], dma_done_event_tick[x]);
+ }
+
updateVideoParams();
if (vncserver)
vncserver->setDirty();
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
