diff --git a/src/main/java/tmltranslator/tomappingsystemc2/MappedSystemCTask.java b/src/main/java/tmltranslator/tomappingsystemc2/MappedSystemCTask.java index dc25711b7276157eacbf11a290118b81c7458596..6c3a63328359069febac73af2a6ddc4f743dcbe0 100644 --- a/src/main/java/tmltranslator/tomappingsystemc2/MappedSystemCTask.java +++ b/src/main/java/tmltranslator/tomappingsystemc2/MappedSystemCTask.java @@ -701,7 +701,8 @@ public class MappedSystemCTask { TMLReadChannel rCommand = (TMLReadChannel) currElem; String nbOfSamples = rCommand.getNbOfSamples(); if (rCommand.getSecurityPattern() != null) { - nbOfSamples = "( " + nbOfSamples + ") + " + rCommand.getSecurityPattern().getOverhead(); + nbOfSamples = "( " + nbOfSamples + ") + (" + + rCommand.getSecurityPattern().getOverhead() + " / " +rCommand.getChannel(0).getSize() + ")"; } if (isIntValue(nbOfSamples)) //initCommand+= "," + cmdName + "("+currElem.getID()+",this,0," + rCommand.getChannel(0).getExtendedName() + "," + rCommand.getChannel(0).getSize() + "*" + rCommand.getNbOfSamples() + ")"+CR; @@ -718,7 +719,8 @@ public class MappedSystemCTask { } else if (currElem instanceof TMLWriteChannel) { String channels; TMLWriteChannel wCommand = (TMLWriteChannel) currElem; - String nbOfSamples = wCommand.getNbOfSamples(); + String nbOfSamples ; + if (wCommand.getNbOfChannels() > 1) { if (ChannelMappedOnSameHW(wCommand)) { if (debug) TraceManager.addDev("Checking WriteMult with multicast\n"); @@ -736,9 +738,10 @@ public class MappedSystemCTask { TMLWriteChannel newWrite = new TMLWriteChannel("WriteMult", null); if (i == 0) firstWrite = newWrite; newWrite.addChannel(wCommand.getChannel(i)); - + nbOfSamples = wCommand.getNbOfSamples(); if (wCommand.getSecurityPattern() != null) { - nbOfSamples = "( " + nbOfSamples + ") + " + wCommand.getSecurityPattern().getOverhead(); + nbOfSamples = "( " + nbOfSamples + ") + (" + + wCommand.getSecurityPattern().getOverhead() + " / " + wCommand.getChannel(i).getSize() + ")"; } newWrite.setNbOfSamples(nbOfSamples); if (prevWrite != null) prevWrite.addNext(newWrite); @@ -752,6 +755,11 @@ public class MappedSystemCTask { hcode += "TMLWriteCommand " + cmdName + SCCR; channels = wCommand.getChannel(0).getExtendedName(); } + nbOfSamples = wCommand.getNbOfSamples(); + if (wCommand.getSecurityPattern() != null) { + nbOfSamples = "( " + nbOfSamples + ") + (" + + wCommand.getSecurityPattern().getOverhead() + " / (" + wCommand.getChannel(0).getSize() + ")"; + } if (isIntValue(nbOfSamples)) initCommand += "," + cmdName + "(" + currElem.getID() + ",this,0," + channels + "," + getFormattedLiveVarStr(currElem) + "," + nbOfSamples + ")" + CR; diff --git a/src/main/java/ui/window/JDialogProverifVerification.java b/src/main/java/ui/window/JDialogProverifVerification.java index 1dce659f706f96f9c506c836b175ce252a916d81..e1f1c44dc3d68d0f0e63d0bf90b202fb590f0d38 100644 --- a/src/main/java/ui/window/JDialogProverifVerification.java +++ b/src/main/java/ui/window/JDialogProverifVerification.java @@ -923,7 +923,7 @@ public class JDialogProverifVerification extends JDialog implements ActionListen decTime.setEnabled(false); jp02.add(decTime, c01); - jp02.add(new JLabel("Data Overhead (bits)"), c01); + jp02.add(new JLabel("Data Overhead (in bytes)"), c01); secOverhead = new JTextField(secOv); secOverhead.setEnabled(false); jp02.add(secOverhead, c01);