allow inverted display of negative sense busses
This commit is contained in:
parent
d045485ec4
commit
580f4585a6
16
macros.js
16
macros.js
|
@ -29,7 +29,7 @@ var logThese=[];
|
||||||
var presetLogLists=[
|
var presetLogLists=[
|
||||||
['cycle'],
|
['cycle'],
|
||||||
['ab','db','rw','sync','pc','a','x','y','s','p'],
|
['ab','db','rw','sync','pc','a','x','y','s','p'],
|
||||||
['ir','tcstate','pd'],
|
['ir','tcstate','-pd'],
|
||||||
['adl','adh','sb','alu'],
|
['adl','adh','sb','alu'],
|
||||||
['alucin','alua','alub','alucout','aluvout','dasb'],
|
['alucin','alua','alub','alucout','aluvout','dasb'],
|
||||||
['plaOutputs'],
|
['plaOutputs'],
|
||||||
|
@ -312,13 +312,22 @@ function busToString(busname){
|
||||||
return ['clock1','clock2','t2','t3','t4','t5'].map(busToHex).join("");
|
return ['clock1','clock2','t2','t3','t4','t5'].map(busToHex).join("");
|
||||||
if(busname=='plaOutputs')
|
if(busname=='plaOutputs')
|
||||||
return listActivePlaOutputs();
|
return listActivePlaOutputs();
|
||||||
return busToHex(busname);
|
if(busname[0]=="-"){
|
||||||
|
// invert the value of the bus for display
|
||||||
|
var value=busToHex(busname.slice(1))
|
||||||
|
if(typeof value != "undefined")
|
||||||
|
return value.replace(/./g,function(x){return (15-parseInt(x,16)).toString(16)});
|
||||||
|
else
|
||||||
|
return undefined;;
|
||||||
|
} else {
|
||||||
|
return busToHex(busname);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function busToHex(busname){
|
function busToHex(busname){
|
||||||
// may be passed a bus or a signal, so allow multiple signals
|
// may be passed a bus or a signal, so allow multiple signals
|
||||||
var width=0;
|
var width=0;
|
||||||
var r=new RegExp('^' + busname + '[0-9]');
|
var r=new RegExp('^' + busname + '[0-9]+$');
|
||||||
for(var i in nodenamelist){
|
for(var i in nodenamelist){
|
||||||
if(r.test(nodenamelist[i])) {
|
if(r.test(nodenamelist[i])) {
|
||||||
width++;
|
width++;
|
||||||
|
@ -512,6 +521,7 @@ function initLogbox(names){
|
||||||
logbox=document.getElementById('logstream');
|
logbox=document.getElementById('logstream');
|
||||||
if(logbox==null)return;
|
if(logbox==null)return;
|
||||||
|
|
||||||
|
names=names.map(function(x){return x.replace(/^-/,'')});
|
||||||
logStream = [];
|
logStream = [];
|
||||||
logStream.push("<td>" + names.join("</td><td>") + "</td>");
|
logStream.push("<td>" + names.join("</td><td>") + "</td>");
|
||||||
logbox.innerHTML = "<tr>"+logStream.join("</tr><tr>")+"</tr>";
|
logbox.innerHTML = "<tr>"+logStream.join("</tr><tr>")+"</tr>";
|
||||||
|
|
Loading…
Reference in New Issue