From 9d5bfcb3748c97c42b5ce35e69085fded59afd9e Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Fri, 28 Aug 2009 09:46:24 +0000
Subject: [PATCH] A few bugs resolved ...
---
src/ui/interactivesimulation/JFrameInteractiveSimulation.java | 4 ++--
src/ui/tmldd/TMLArchiCPUNode.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index b044f73777..423519b078 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -1106,7 +1106,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
protected boolean loadConfiguration(Node node1) {
NodeList diagramNl = node1.getChildNodes();
- if (diagramN == null) {
+ if (diagramNl == null) {
return false;
}
Element elt, elt0;
@@ -2177,4 +2177,4 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
}
-} // Class
\ No newline at end of file
+} // Class
diff --git a/src/ui/tmldd/TMLArchiCPUNode.java b/src/ui/tmldd/TMLArchiCPUNode.java
index eb1b0185f6..588bf900c9 100755
--- a/src/ui/tmldd/TMLArchiCPUNode.java
+++ b/src/ui/tmldd/TMLArchiCPUNode.java
@@ -565,7 +565,7 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
}
attr += "Task switching time (in cycle) = " + taskSwitchingTime + "\n";
attr += "Go in idle mode (in cycle) = " + goIdleTime + "\n";
- attr += "Max consecutive idle cycles before going in idle mode (in cycle) = " + maxConsecutiveIdleCycles + "\n";
+ attr += "Max idle cycles before going idle = " + maxConsecutiveIdleCycles + "\n";
attr += "EXECI execution time (in cycle) = " + execiTime + "\n";
attr += "EXECC execution time (in cycle) = " + execcTime + "\n";
attr += "Branching prediction misrate (in %) = " + branchingPredictionPenalty + "\n";
--
GitLab