From 0a6866f10cc6d7a83f87bea30a7419d61f46cb5a Mon Sep 17 00:00:00 2001 From: Ed Spittles Date: Tue, 29 May 2018 10:51:02 +0100 Subject: [PATCH] Add two signals to DPControl fixing #50 --- expert-allinone.js | 5 ++++- macros.js | 2 +- nodenames.js | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/expert-allinone.js b/expert-allinone.js index 7a8cdbc..99e4026 100644 --- a/expert-allinone.js +++ b/expert-allinone.js @@ -12470,7 +12470,10 @@ AxB7: 1241, // internal signals: datapath control signals "ADL/ABL": 639, // load ABL latches from ADL bus +"dpc-1_ADL/ABL": 639,// alias for DPControl pseudo-bus + "ADH/ABH": 821, // load ABH latches from ADH bus +"dpc-2_ADH/ABH": 821,// alias for DPControl pseudo-bus dpc0_YSB: 801, // drive sb from y dpc1_SBY: 325, // load y from sb @@ -14130,7 +14133,7 @@ function busToString(busname){ // - we'll allow the x and xx prefix but ignore the # return listActiveSignals('^([x]?x-)?op-'); if(busname=='DPControl') - return listActiveSignals('^dpc[0-9]+_'); + return listActiveSignals('^dpc[-]?[0-9]+_'); if(busname[0]=="-"){ // invert the value of the bus for display var value=busToHex(busname.slice(1)) diff --git a/macros.js b/macros.js index 8759168..d7d3918 100644 --- a/macros.js +++ b/macros.js @@ -411,7 +411,7 @@ function busToString(busname){ // - we'll allow the x and xx prefix but ignore the # return listActiveSignals('^([x]?x-)?op-'); if(busname=='DPControl') - return listActiveSignals('^dpc[0-9]+_'); + return listActiveSignals('^dpc[-]?[0-9]+_'); if(busname[0]=="-"){ // invert the value of the bus for display var value=busToHex(busname.slice(1)) diff --git a/nodenames.js b/nodenames.js index cab1e8f..135dd42 100644 --- a/nodenames.js +++ b/nodenames.js @@ -863,7 +863,10 @@ AxB7: 1241, // internal signals: datapath control signals "ADL/ABL": 639, // load ABL latches from ADL bus +"dpc-1_ADL/ABL": 639,// alias for DPControl pseudo-bus + "ADH/ABH": 821, // load ABH latches from ADH bus +"dpc-2_ADH/ABH": 821,// alias for DPControl pseudo-bus dpc0_YSB: 801, // drive sb from y dpc1_SBY: 325, // load y from sb