From 78f30e0b5808730e8b29dacab1ad142f81e60686 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Tue, 28 Sep 2021 11:07:41 +0100 Subject: [PATCH] add ISACallerFnHelper, remove FPADD32 and other FP helpers --- src/openpower/decoder/pseudo/pywriter.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/openpower/decoder/pseudo/pywriter.py b/src/openpower/decoder/pseudo/pywriter.py index dafe6122..b01fc4cc 100644 --- a/src/openpower/decoder/pseudo/pywriter.py +++ b/src/openpower/decoder/pseudo/pywriter.py @@ -35,10 +35,10 @@ from openpower.decoder.isafunctions.all import ISACallerFnHelper fpheader = """ from openpower.decoder.helpers import ( SINGLE, - FPADD32, FPSUB32, FPMUL32, FPDIV32, + #FPADD32, FPSUB32, FPMUL32, FPDIV32, FPADD64, FPSUB64, FPMUL64, FPDIV64, - FPMULADD32, - FPSIN32, FPCOS32, + #FPMULADD32, + #FPSIN32, FPCOS32, ) """ @@ -137,12 +137,15 @@ class PyISAWriter(ISA): f.write('# auto-generated by pywriter.py: do not edit or commit\n') f.write('from openpower.decoder.isa.caller import ISACaller\n') f.write('from openpower.decoder.helpers import ISACallerHelper\n') + f.write('from openpower.decoder.isafunctions.all ' + 'import ISACallerFnHelper\n') for page in self.pages_written: f.write('from openpower.decoder.isa.%s ' \ 'import %s\n' % (page, page)) f.write('\n') - classes = ', '.join(['ISACaller', 'ISACallerHelper'] + self.pages_written) + classes = ', '.join(['ISACaller', 'ISACallerFnHelper', + 'ISACallerHelper'] + self.pages_written) f.write('class ISA(%s):\n' % classes) f.write(' def __init__(self, *args, **kwargs):\n') f.write(' super().__init__(*args, **kwargs)\n') -- 2.30.2