riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fmt,cxxrtl: add support for uppercase hex format. 

This is necessary for translating Python format strings in Amaranth.
This commit is contained in:
Catherine 2024-03-28 06:13:35 +00:00 committed by Marcelina Kościelnicka
parent a5441bc00c
commit 8388846e3a
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backends/cxxrtl/runtime/cxxrtl/cxxrtl.h
View File

@ -1034,6 +1034,7 @@ struct fmt_part {
unsigned base; // = 10;
bool signed_; // = false;
bool plus; // = false;
bool hex_upper; // = false;
// VLOG_TIME type
bool realtime; // = false;
@ -1085,7 +1086,7 @@ struct fmt_part {
uint8_t value = val.bit(index) | (val.bit(index + 1) << 1) | (val.bit(index + 2) << 2);
if (step == 4)
value |= val.bit(index + 3) << 3;
buf += "0123456789abcdef"[value];
buf += (hex_upper ? "0123456789ABCDEF" : "0123456789abcdef")[value];
}
std::reverse(buf.begin(), buf.end());
} else if (base == 10) {

11
kernel/fmt.cc
View File

@ -107,6 +107,10 @@ void Fmt::parse_rtlil(const RTLIL::Cell *cell) {
} else if (fmt[i] == 'h') {
part.type = FmtPart::INTEGER;
part.base = 16;
} else if (fmt[i] == 'H') {
part.type = FmtPart::INTEGER;
part.base = 16;
part.hex_upper = true;
} else if (fmt[i] == 'c') {
part.type = FmtPart::STRING;
} else if (fmt[i] == 't') {
@ -197,7 +201,7 @@ void Fmt::emit_rtlil(RTLIL::Cell *cell) const {
case 2: fmt += 'b'; break;
case 8: fmt += 'o'; break;
case 10: fmt += 'd'; break;
case 16: fmt += 'h'; break;
case 16: fmt += part.hex_upper ? 'H' : 'h'; break;
default: log_abort();
}
if (part.plus)
@ -507,7 +511,7 @@ std::vector<VerilogFmtArg> Fmt::emit_verilog() const
case 2: fmt.str += 'b'; break;
case 8: fmt.str += 'o'; break;
case 10: fmt.str += 'd'; break;
case 16: fmt.str += 'h'; break;
case 16: fmt.str += 'h'; break; // treat uppercase hex as lowercase
default: log_abort();
}
break;
@ -617,6 +621,7 @@ void Fmt::emit_cxxrtl(std::ostream &os, std::string indent, std::function<void(c
os << part.base << ", ";
os << part.signed_ << ", ";
os << part.plus << ", ";
os << part.hex_upper << ", ";
os << part.realtime;
os << " }.render(";
emit_sig(part.sig);
@ -676,7 +681,7 @@ std::string Fmt::render() const
else if (has_z)
buf += 'Z';
else
buf += "0123456789abcdef"[subvalue.as_int()];
buf += (part.hex_upper ? "0123456789ABCDEF" : "0123456789abcdef")[subvalue.as_int()];
}
std::reverse(buf.begin(), buf.end());
} else if (part.base == 10) {

1
kernel/fmt.h
View File

@ -77,6 +77,7 @@ struct FmtPart {
unsigned base = 10;
bool signed_ = false;
bool plus = false;
bool hex_upper = false;
// VLOG_TIME type
bool realtime = false;