| Message ID | 20201130122639.2431070-1-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | decodetree: Allow use of hex/bin format for argument field values | expand |
On Mon, Nov 30, 2020 at 1:26 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > ISA datasheets often use binary or hexadecimal constant values. > By doing base conversion, we might introduce bugs. Safer is to > copy/paste the datasheet value. > Add support for bin/hex constants in argument field token. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > Is there a more pythonic way to write this if/elif/else > loop without re.fullmatch? BTW I discarded the simple "int(value, 0)" to have strict checks, but if this is enough it is certainly simpler. > --- > scripts/decodetree.py | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/scripts/decodetree.py b/scripts/decodetree.py > index 47aa9caf6d1..d2ecc61813f 100644 > --- a/scripts/decodetree.py > +++ b/scripts/decodetree.py > @@ -849,9 +849,15 @@ def parse_generic(lineno, parent_pat, name, toks): > continue > > # 'Foo=number' sets an argument field to a constant value > - if re.fullmatch(re_C_ident + '=[+-]?[0-9]+', t): > + if re.fullmatch(re_C_ident + '=[+-]?(0[bx])?[0-9]+', t): > (fname, value) = t.split('=') > - value = int(value) > + if re.fullmatch('[+-]?0b[0-9]+', value): > + base = 2 > + elif re.fullmatch('[+-]?0x[0-9]+', value): > + base = 16 > + else: > + base = 10 > + value = int(value, base) > flds = add_field(lineno, flds, fname, ConstField(value)) > continue > > -- > 2.26.2 >
On 11/30/20 6:26 AM, Philippe Mathieu-Daudé wrote: > # 'Foo=number' sets an argument field to a constant value > - if re.fullmatch(re_C_ident + '=[+-]?[0-9]+', t): > + if re.fullmatch(re_C_ident + '=[+-]?(0[bx])?[0-9]+', t): > (fname, value) = t.split('=') > - value = int(value) > + if re.fullmatch('[+-]?0b[0-9]+', value): > + base = 2 > + elif re.fullmatch('[+-]?0x[0-9]+', value): > + base = 16 > + else: > + base = 10 > + value = int(value, base) > flds = add_field(lineno, flds, fname, ConstField(value)) > continue Well, the regxps are off. No letters for the hex, and 9 accepted for binary. I think with the right regexps, just trusting int(value, 0) is good enough. So maybe something like re_C_ident + "=[+-]?([0-9]+|0x[0-9a-fA-F]+|0b[01]+)" r~
On 11/30/20 7:22 PM, Richard Henderson wrote: > On 11/30/20 6:26 AM, Philippe Mathieu-Daudé wrote: >> # 'Foo=number' sets an argument field to a constant value >> - if re.fullmatch(re_C_ident + '=[+-]?[0-9]+', t): >> + if re.fullmatch(re_C_ident + '=[+-]?(0[bx])?[0-9]+', t): >> (fname, value) = t.split('=') >> - value = int(value) >> + if re.fullmatch('[+-]?0b[0-9]+', value): >> + base = 2 >> + elif re.fullmatch('[+-]?0x[0-9]+', value): >> + base = 16 >> + else: >> + base = 10 >> + value = int(value, base) >> flds = add_field(lineno, flds, fname, ConstField(value)) >> continue > > Well, the regxps are off. No letters for the hex, and 9 accepted for binary. > I think with the right regexps, just trusting int(value, 0) is good enough. OK! > > So maybe something like > > re_C_ident + "=[+-]?([0-9]+|0x[0-9a-fA-F]+|0b[01]+)" Better indeed :) Thanks, Phil.
diff --git a/scripts/decodetree.py b/scripts/decodetree.py index 47aa9caf6d1..d2ecc61813f 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -849,9 +849,15 @@ def parse_generic(lineno, parent_pat, name, toks): continue # 'Foo=number' sets an argument field to a constant value - if re.fullmatch(re_C_ident + '=[+-]?[0-9]+', t): + if re.fullmatch(re_C_ident + '=[+-]?(0[bx])?[0-9]+', t): (fname, value) = t.split('=') - value = int(value) + if re.fullmatch('[+-]?0b[0-9]+', value): + base = 2 + elif re.fullmatch('[+-]?0x[0-9]+', value): + base = 16 + else: + base = 10 + value = int(value, base) flds = add_field(lineno, flds, fname, ConstField(value)) continue
ISA datasheets often use binary or hexadecimal constant values. By doing base conversion, we might introduce bugs. Safer is to copy/paste the datasheet value. Add support for bin/hex constants in argument field token. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- Is there a more pythonic way to write this if/elif/else loop without re.fullmatch? --- scripts/decodetree.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)