diff --git a/lib/calc_viz.tlv b/lib/calc_viz.tlv index 9708357..5ff74bc 100644 --- a/lib/calc_viz.tlv +++ b/lib/calc_viz.tlv @@ -208,18 +208,18 @@ result[sig_name] = getSig(sig_name) return result }, {}) - this.getInitObject("val1num").setText(sigs.val1.asInt(NaN).toString(16).padStart(8, " ")) - this.getInitObject("val2num").setText(sigs.val2.asInt(NaN).toString(16).padStart(8, " ")) - this.getInitObject("outnum").setText(sigs.out.asInt(NaN).toString(16).padStart(8, " ")) + this.getInitObject("val1num").set({text: sigs.val1.asInt(NaN).toString(16).padStart(8, " ")}) + this.getInitObject("val2num").set({text: sigs.val2.asInt(NaN).toString(16).padStart(8, " ")}) + this.getInitObject("outnum").set({text: sigs.out.asInt(NaN).toString(16).padStart(8, " ")}) let op = sigs.op.asInt(NaN) - this.getInitObject("sumbox").setFill(op == 0 ? "#c0d0e0" : "#a0a0a0") - this.getInitObject("minbox").setFill(op == 1 ? "#c0d0e0" : "#a0a0a0") - this.getInitObject("prodbox").setFill(op == 2 ? "#c0d0e0" : "#a0a0a0") - this.getInitObject("quotbox").setFill(op == 3 ? "#c0d0e0" : "#a0a0a0") + this.getInitObject("sumbox").set({fill: op == 0 ? "#c0d0e0" : "#a0a0a0"}) + this.getInitObject("minbox").set({fill: op == 1 ? "#c0d0e0" : "#a0a0a0"}) + this.getInitObject("prodbox").set({fill: op == 2 ? "#c0d0e0" : "#a0a0a0"}) + this.getInitObject("quotbox").set({fill: op == 3 ? "#c0d0e0" : "#a0a0a0"}) if (missing_list) { - this.getInitObject("calbox").setFill("red") - this.getInitObject("missing_sigs").setVisible(true) - this.fromInit().missing.setText(missing_list) + this.getInitObject("calbox").set({fill: "red"}) + this.getInitObject("missing_sigs").set({visible:true}) + this.fromInit().missing.set({text: missing_list}) } } \TLV diff --git a/lib/risc-v_shell_lib.tlv b/lib/risc-v_shell_lib.tlv index 0042e7e..2fcaaa5 100644 --- a/lib/risc-v_shell_lib.tlv +++ b/lib/risc-v_shell_lib.tlv @@ -672,8 +672,8 @@ m4+definitions([' // Missing signals if (missing_list[0]) { this.getInitObject("missing_sigs").setVisible(true) - this.fromInit().missing_col1.setText(missing_list[0]) - this.fromInit().missing_col2.setText(missing_list[1]) + this.fromInit().missing_col1.set({text: missing_list[0]}) + this.fromInit().missing_col2.set({text: missing_list[1]}) } return {objects: [pcPointer, pc_arrow, ...type_texts, rs1_arrow, rs2_arrow, rd_arrow, instrWithValues, fetch_instr_viz, src1_value_viz, src2_value_viz, result_shadow, result_viz, ld_arrow, st_arrow, load_viz, store_viz]}; } @@ -710,13 +710,13 @@ m4+definitions([' let instr = this.svSigRef(`instrs(${this.getIndex()})`) if (instr) { let binary_str = instr.goToSimStart().asBinaryStr("") - this.getInitObject("binary").setText(binary_str) + this.getInitObject("binary").set(text: binary_str}) } let disassembled = this.svSigRef(`instr_strs(${this.getIndex()})`) if (disassembled) { let disassembled_str = disassembled.goToSimStart().asString("") disassembled_str = disassembled_str.slice(0, -5) - this.getInitObject("disassembled").setText(disassembled_str) + this.getInitObject("disassembled").set({text: disassembled_str}) } } this.getInitObject("disassembled").set({textBackgroundColor: rd_viz ? "#b0ffff" : "white"})