From f477f5674a2b23ed7281dcc29473648b87e6d8d9 Mon Sep 17 00:00:00 2001 From: Felix Hauptmann Date: Tue, 10 Oct 2023 00:54:21 +0200 Subject: [PATCH] fix csv parsing --- constants.py | 8 +- csrs32.csv | 254 +++++++++++++++++++++++++-------------------------- 2 files changed, 131 insertions(+), 131 deletions(-) diff --git a/constants.py b/constants.py index ac67560b..9ff08c05 100644 --- a/constants.py +++ b/constants.py @@ -26,22 +26,22 @@ causes = [] with open("causes.csv") as f: - csv_reader = csv.reader(f) + csv_reader = csv.reader(f, skipinitialspace=True) for row in csv_reader: causes.append((int(row[0], 0), row[1])) csrs = [] with open("csrs.csv") as f: - csv_reader = csv.reader(f) + csv_reader = csv.reader(f, skipinitialspace=True) for row in csv_reader: csrs.append((int(row[0], 0), row[1])) csrs32 = [] with open("csrs32.csv") as f: - csv_reader = csv.reader(f) + csv_reader = csv.reader(f, skipinitialspace=True) for row in csv_reader: csrs32.append((int(row[0], 0), row[1])) arg_lut = {} with open("arg_lut.csv") as f: - csv_reader = csv.reader(f) + csv_reader = csv.reader(f, skipinitialspace=True) for row in csv_reader: k = row[0] v = (int(row[1]), int(row[2])) diff --git a/csrs32.csv b/csrs32.csv index dc8767f3..9223eb2b 100644 --- a/csrs32.csv +++ b/csrs32.csv @@ -1,127 +1,127 @@ -0x114, 'sieh' -0x154, 'siph' -0x15D, 'stimecmph' -0x214, 'vsieh' -0x254, 'vsiph' -0x25D, 'vstimecmph' -0x615, 'htimedeltah' -0x613, 'hidelegh' -0x618, 'hvienh' -0x61A, 'henvcfgh' -0x655, 'hviph' -0x656, 'hviprio1h' -0x657, 'hviprio2h' -0x61C, 'hstateen0h' -0x61D, 'hstateen1h' -0x61E, 'hstateen2h' -0x61F, 'hstateen3h' -0xC80, 'cycleh' -0xC81, 'timeh' -0xC82, 'instreth' -0xC83, 'hpmcounter3h' -0xC84, 'hpmcounter4h' -0xC85, 'hpmcounter5h' -0xC86, 'hpmcounter6h' -0xC87, 'hpmcounter7h' -0xC88, 'hpmcounter8h' -0xC89, 'hpmcounter9h' -0xC8A, 'hpmcounter10h' -0xC8B, 'hpmcounter11h' -0xC8C, 'hpmcounter12h' -0xC8D, 'hpmcounter13h' -0xC8E, 'hpmcounter14h' -0xC8F, 'hpmcounter15h' -0xC90, 'hpmcounter16h' -0xC91, 'hpmcounter17h' -0xC92, 'hpmcounter18h' -0xC93, 'hpmcounter19h' -0xC94, 'hpmcounter20h' -0xC95, 'hpmcounter21h' -0xC96, 'hpmcounter22h' -0xC97, 'hpmcounter23h' -0xC98, 'hpmcounter24h' -0xC99, 'hpmcounter25h' -0xC9A, 'hpmcounter26h' -0xC9B, 'hpmcounter27h' -0xC9C, 'hpmcounter28h' -0xC9D, 'hpmcounter29h' -0xC9E, 'hpmcounter30h' -0xC9F, 'hpmcounter31h' -0x310, 'mstatush' -0x313, 'midelegh' -0x314, 'mieh' -0x318, 'mvienh' -0x319, 'mviph' -0x31A, 'menvcfgh' -0x31C, 'mstateen0h' -0x31D, 'mstateen1h' -0x31E, 'mstateen2h' -0x31F, 'mstateen3h' -0x354, 'miph' -0x721, 'mcyclecfgh' -0x722, 'minstretcfgh' -0x723, 'mhpmevent3h' -0x724, 'mhpmevent4h' -0x725, 'mhpmevent5h' -0x726, 'mhpmevent6h' -0x727, 'mhpmevent7h' -0x728, 'mhpmevent8h' -0x729, 'mhpmevent9h' -0x72A, 'mhpmevent10h' -0x72B, 'mhpmevent11h' -0x72C, 'mhpmevent12h' -0x72D, 'mhpmevent13h' -0x72E, 'mhpmevent14h' -0x72F, 'mhpmevent15h' -0x730, 'mhpmevent16h' -0x731, 'mhpmevent17h' -0x732, 'mhpmevent18h' -0x733, 'mhpmevent19h' -0x734, 'mhpmevent20h' -0x735, 'mhpmevent21h' -0x736, 'mhpmevent22h' -0x737, 'mhpmevent23h' -0x738, 'mhpmevent24h' -0x739, 'mhpmevent25h' -0x73A, 'mhpmevent26h' -0x73B, 'mhpmevent27h' -0x73C, 'mhpmevent28h' -0x73D, 'mhpmevent29h' -0x73E, 'mhpmevent30h' -0x73F, 'mhpmevent31h' -0x740, 'mnscratch' -0x741, 'mnepc' -0x742, 'mncause' -0x744, 'mnstatus' -0x757, 'mseccfgh' -0xB80, 'mcycleh' -0xB82, 'minstreth' -0xB83, 'mhpmcounter3h' -0xB84, 'mhpmcounter4h' -0xB85, 'mhpmcounter5h' -0xB86, 'mhpmcounter6h' -0xB87, 'mhpmcounter7h' -0xB88, 'mhpmcounter8h' -0xB89, 'mhpmcounter9h' -0xB8A, 'mhpmcounter10h' -0xB8B, 'mhpmcounter11h' -0xB8C, 'mhpmcounter12h' -0xB8D, 'mhpmcounter13h' -0xB8E, 'mhpmcounter14h' -0xB8F, 'mhpmcounter15h' -0xB90, 'mhpmcounter16h' -0xB91, 'mhpmcounter17h' -0xB92, 'mhpmcounter18h' -0xB93, 'mhpmcounter19h' -0xB94, 'mhpmcounter20h' -0xB95, 'mhpmcounter21h' -0xB96, 'mhpmcounter22h' -0xB97, 'mhpmcounter23h' -0xB98, 'mhpmcounter24h' -0xB99, 'mhpmcounter25h' -0xB9A, 'mhpmcounter26h' -0xB9B, 'mhpmcounter27h' -0xB9C, 'mhpmcounter28h' -0xB9D, 'mhpmcounter29h' -0xB9E, 'mhpmcounter30h' -0xB9F, 'mhpmcounter31h' +0x114, "sieh" +0x154, "siph" +0x15D, "stimecmph" +0x214, "vsieh" +0x254, "vsiph" +0x25D, "vstimecmph" +0x615, "htimedeltah" +0x613, "hidelegh" +0x618, "hvienh" +0x61A, "henvcfgh" +0x655, "hviph" +0x656, "hviprio1h" +0x657, "hviprio2h" +0x61C, "hstateen0h" +0x61D, "hstateen1h" +0x61E, "hstateen2h" +0x61F, "hstateen3h" +0xC80, "cycleh" +0xC81, "timeh" +0xC82, "instreth" +0xC83, "hpmcounter3h" +0xC84, "hpmcounter4h" +0xC85, "hpmcounter5h" +0xC86, "hpmcounter6h" +0xC87, "hpmcounter7h" +0xC88, "hpmcounter8h" +0xC89, "hpmcounter9h" +0xC8A, "hpmcounter10h" +0xC8B, "hpmcounter11h" +0xC8C, "hpmcounter12h" +0xC8D, "hpmcounter13h" +0xC8E, "hpmcounter14h" +0xC8F, "hpmcounter15h" +0xC90, "hpmcounter16h" +0xC91, "hpmcounter17h" +0xC92, "hpmcounter18h" +0xC93, "hpmcounter19h" +0xC94, "hpmcounter20h" +0xC95, "hpmcounter21h" +0xC96, "hpmcounter22h" +0xC97, "hpmcounter23h" +0xC98, "hpmcounter24h" +0xC99, "hpmcounter25h" +0xC9A, "hpmcounter26h" +0xC9B, "hpmcounter27h" +0xC9C, "hpmcounter28h" +0xC9D, "hpmcounter29h" +0xC9E, "hpmcounter30h" +0xC9F, "hpmcounter31h" +0x310, "mstatush" +0x313, "midelegh" +0x314, "mieh" +0x318, "mvienh" +0x319, "mviph" +0x31A, "menvcfgh" +0x31C, "mstateen0h" +0x31D, "mstateen1h" +0x31E, "mstateen2h" +0x31F, "mstateen3h" +0x354, "miph" +0x721, "mcyclecfgh" +0x722, "minstretcfgh" +0x723, "mhpmevent3h" +0x724, "mhpmevent4h" +0x725, "mhpmevent5h" +0x726, "mhpmevent6h" +0x727, "mhpmevent7h" +0x728, "mhpmevent8h" +0x729, "mhpmevent9h" +0x72A, "mhpmevent10h" +0x72B, "mhpmevent11h" +0x72C, "mhpmevent12h" +0x72D, "mhpmevent13h" +0x72E, "mhpmevent14h" +0x72F, "mhpmevent15h" +0x730, "mhpmevent16h" +0x731, "mhpmevent17h" +0x732, "mhpmevent18h" +0x733, "mhpmevent19h" +0x734, "mhpmevent20h" +0x735, "mhpmevent21h" +0x736, "mhpmevent22h" +0x737, "mhpmevent23h" +0x738, "mhpmevent24h" +0x739, "mhpmevent25h" +0x73A, "mhpmevent26h" +0x73B, "mhpmevent27h" +0x73C, "mhpmevent28h" +0x73D, "mhpmevent29h" +0x73E, "mhpmevent30h" +0x73F, "mhpmevent31h" +0x740, "mnscratch" +0x741, "mnepc" +0x742, "mncause" +0x744, "mnstatus" +0x757, "mseccfgh" +0xB80, "mcycleh" +0xB82, "minstreth" +0xB83, "mhpmcounter3h" +0xB84, "mhpmcounter4h" +0xB85, "mhpmcounter5h" +0xB86, "mhpmcounter6h" +0xB87, "mhpmcounter7h" +0xB88, "mhpmcounter8h" +0xB89, "mhpmcounter9h" +0xB8A, "mhpmcounter10h" +0xB8B, "mhpmcounter11h" +0xB8C, "mhpmcounter12h" +0xB8D, "mhpmcounter13h" +0xB8E, "mhpmcounter14h" +0xB8F, "mhpmcounter15h" +0xB90, "mhpmcounter16h" +0xB91, "mhpmcounter17h" +0xB92, "mhpmcounter18h" +0xB93, "mhpmcounter19h" +0xB94, "mhpmcounter20h" +0xB95, "mhpmcounter21h" +0xB96, "mhpmcounter22h" +0xB97, "mhpmcounter23h" +0xB98, "mhpmcounter24h" +0xB99, "mhpmcounter25h" +0xB9A, "mhpmcounter26h" +0xB9B, "mhpmcounter27h" +0xB9C, "mhpmcounter28h" +0xB9D, "mhpmcounter29h" +0xB9E, "mhpmcounter30h" +0xB9F, "mhpmcounter31h"