Makes .isa files cleaner and simplifies scanner too. Simplified scanner to work under both old and new versions of scons. arch/SConscript: Simplify .isa scanner... seems to work with both scons 0.96.1 and 0.96.91 now. Assumes .isa ##include paths are relative to including file. arch/alpha/isa/main.isa: arch/mips/isa/formats/formats.isa: arch/mips/isa/main.isa: arch/sparc/isa/formats.isa: arch/sparc/isa/main.isa: Make ##include paths relative to including file. arch/isa_parser.py: Make ##include file paths relative to including file. Makes .isa files cleaner and simplifies scanner too. Partial rewrite of include-handling code to use cool re.sub() feature where you can specify a function to provide the replacement string. Minor cleanup of error-handling code. Also got rid of '#!' at top to make caller choose which python interpreter is used (since SPARC now requires 2.4 to build, we may need to do that via scons in the future). --HG-- rename : arch/mips/isa/formats.isa => arch/mips/isa/formats/formats.isa extra : convert_revision : 15a3920fa3aaf80cd94083eda853aa4e49425045
28 lines
611 B
Text
28 lines
611 B
Text
//Include the basic format
|
|
//Templates from this format are used later
|
|
##include "formats/basic.isa"
|
|
|
|
//Include the integerOp and integerOpCc format
|
|
##include "formats/integerop.isa"
|
|
|
|
//Include the memory format
|
|
##include "formats/mem.isa"
|
|
|
|
//Include the compare and swap format
|
|
##include "formats/cas.isa"
|
|
|
|
//Include the trap format
|
|
##include "formats/trap.isa"
|
|
|
|
//Include the "unknown" format
|
|
##include "formats/unknown.isa"
|
|
|
|
//Include the priveleged mode format
|
|
##include "formats/priv.isa"
|
|
|
|
//Include the branch format
|
|
##include "formats/branch.isa"
|
|
|
|
//Include the noop format
|
|
##include "formats/noop.isa"
|
|
|