projects
/
soc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add a DIVS function as separate and discrete from floor_div
[soc.git]
/
src
/
soc
/
decoder
/
pseudo
/
pywriter.py
diff --git
a/src/soc/decoder/pseudo/pywriter.py
b/src/soc/decoder/pseudo/pywriter.py
index 7a1c3f5ec22fcd0aa675963ab385007ad82c1b4e..f06d996f388399bb8cd078107bc967f394788bbb 100644
(file)
--- a/
src/soc/decoder/pseudo/pywriter.py
+++ b/
src/soc/decoder/pseudo/pywriter.py
@@
-2,6
+2,8
@@
import os
import sys
import os
import sys
+import shutil
+import subprocess
from soc.decoder.pseudo.pagereader import ISA
from soc.decoder.power_pseudo import convert_to_python
from soc.decoder.orderedset import OrderedSet
from soc.decoder.pseudo.pagereader import ISA
from soc.decoder.power_pseudo import convert_to_python
from soc.decoder.orderedset import OrderedSet
@@
-17,7
+19,9
@@
header = """\
# auto-generated by pywriter.py, do not edit or commit
from soc.decoder.isa.caller import inject, instruction_info
# auto-generated by pywriter.py, do not edit or commit
from soc.decoder.isa.caller import inject, instruction_info
-from soc.decoder.helpers import (EXTS, EXTS64, EXTZ64, ROTL64, ROTL32, MASK,)
+from soc.decoder.helpers import (EXTS, EXTS64, EXTZ64, ROTL64, ROTL32, MASK,
+ ne, eq, gt, ge, lt, le, ltu, gtu, length,
+ trunc_divs, trunc_rems, MULS, DIVS, MODS)
from soc.decoder.selectable_int import SelectableInt
from soc.decoder.selectable_int import selectconcat as concat
from soc.decoder.orderedset import OrderedSet
from soc.decoder.selectable_int import SelectableInt
from soc.decoder.selectable_int import selectconcat as concat
from soc.decoder.orderedset import OrderedSet
@@
-49,10
+53,11
@@
class PyISAWriter(ISA):
# go through all instructions
for page in instrs:
d = self.instr[page]
# go through all instructions
for page in instrs:
d = self.instr[page]
- print (fname, d.opcode)
+ print (
"page", pagename, page,
fname, d.opcode)
pcode = '\n'.join(d.pcode) + '\n'
print (pcode)
pcode = '\n'.join(d.pcode) + '\n'
print (pcode)
- pycode, rused = convert_to_python(pcode, d.form)
+ incl_carry = pagename == 'fixedshift'
+ pycode, rused = convert_to_python(pcode, d.form, incl_carry)
# create list of arguments to call
regs = list(rused['read_regs']) + list(rused['uninit_regs'])
regs += list(rused['special_regs'])
# create list of arguments to call
regs = list(rused['read_regs']) + list(rused['uninit_regs'])
regs += list(rused['special_regs'])
@@
-64,6
+69,8
@@
class PyISAWriter(ISA):
op_fname ="op_%s" % page.replace(".", "_")
f.write(" @inject()\n")
f.write(" def %s(%s):\n" % (op_fname, args))
op_fname ="op_%s" % page.replace(".", "_")
f.write(" @inject()\n")
f.write(" def %s(%s):\n" % (op_fname, args))
+ if 'NIA' in pycode: # HACK - TODO fix
+ f.write(" global NIA\n")
pycode = pycode.split("\n")
pycode = '\n'.join(map(lambda x: " %s" % x, pycode))
pycode = pycode.rstrip()
pycode = pycode.split("\n")
pycode = '\n'.join(map(lambda x: " %s" % x, pycode))
pycode = pycode.rstrip()
@@
-84,11
+91,27
@@
class PyISAWriter(ISA):
f.write(" %s_instrs = {}\n" % pagename)
f.write(iinf)
f.write(" %s_instrs = {}\n" % pagename)
f.write(iinf)
+ def patch_if_needed(self, source):
+ isadir = get_isasrc_dir()
+ fname = os.path.join(isadir, "%s.py" % source)
+ patchname = os.path.join(isadir, "%s.patch" % source)
+
+ try:
+ with open(patchname, 'r') as patch:
+ newfname = fname + '.orig'
+ shutil.copyfile(fname, newfname)
+ subprocess.check_call(['patch', fname],
+ stdin=patch)
+ except:
+ pass
+
+
def write_isa_class(self):
isadir = get_isasrc_dir()
fname = os.path.join(isadir, "all.py")
with open(fname, "w") as f:
def write_isa_class(self):
isadir = get_isasrc_dir()
fname = os.path.join(isadir, "all.py")
with open(fname, "w") as f:
+ f.write('# auto-generated by pywriter.py: do not edit or commit\n')
f.write('from soc.decoder.isa.caller import ISACaller\n')
for page in self.pages_written:
f.write('from soc.decoder.isa.%s import %s\n' % (page, page))
f.write('from soc.decoder.isa.caller import ISACaller\n')
for page in self.pages_written:
f.write('from soc.decoder.isa.%s import %s\n' % (page, page))
@@
-96,8
+119,8
@@
class PyISAWriter(ISA):
classes = ', '.join(['ISACaller'] + self.pages_written)
f.write('class ISA(%s):\n' % classes)
classes = ', '.join(['ISACaller'] + self.pages_written)
f.write('class ISA(%s):\n' % classes)
- f.write(' def __init__(self,
dec, re
gs):\n')
- f.write(' super().__init__(
dec, re
gs)\n')
+ f.write(' def __init__(self,
*args, **kwar
gs):\n')
+ f.write(' super().__init__(
*args, **kwar
gs)\n')
f.write(' self.instrs = {\n')
for page in self.pages_written:
f.write(' **self.%s_instrs,\n' % page)
f.write(' self.instrs = {\n')
for page in self.pages_written:
f.write(' **self.%s_instrs,\n' % page)
@@
-113,4
+136,5
@@
if __name__ == '__main__':
sources = sys.argv[1:]
for source in sources:
isa.write_pysource(source)
sources = sys.argv[1:]
for source in sources:
isa.write_pysource(source)
- #isa.write_isa_class()
+ isa.patch_if_needed(source)
+ isa.write_isa_class()