diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/alpha/isa/main.isa --- a/src/arch/alpha/isa/main.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/alpha/isa/main.isa Wed Apr 23 13:06:38 2014 +0100 @@ -314,7 +314,7 @@ // Basic instruction class constructor template. def template BasicConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/alpha/isa/mem.isa --- a/src/arch/alpha/isa/mem.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/alpha/isa/mem.isa Wed Apr 23 13:06:38 2014 +0100 @@ -155,7 +155,7 @@ }}; def template LoadStoreConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/mips/isa/formats/basic.isa --- a/src/arch/mips/isa/formats/basic.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/mips/isa/formats/basic.isa Wed Apr 23 13:06:38 2014 +0100 @@ -52,7 +52,7 @@ // Basic instruction class constructor template. def template BasicConstructor {{ - inline %(class_name)s::%(class_name)s(MachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) + %(class_name)s::%(class_name)s(MachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; } diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/mips/isa/formats/mem.isa --- a/src/arch/mips/isa/formats/mem.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/mips/isa/formats/mem.isa Wed Apr 23 13:06:38 2014 +0100 @@ -166,7 +166,7 @@ }}; def template LoadStoreConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/power/isa/formats/basic.isa --- a/src/arch/power/isa/formats/basic.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/power/isa/formats/basic.isa Wed Apr 23 13:06:38 2014 +0100 @@ -49,7 +49,7 @@ // Basic instruction class constructor template. def template BasicConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; } diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/power/isa/formats/integer.isa --- a/src/arch/power/isa/formats/integer.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/power/isa/formats/integer.isa Wed Apr 23 13:06:38 2014 +0100 @@ -36,7 +36,7 @@ // Instruction class constructor template when Rc is set. def template IntRcConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; rcSet = true; @@ -46,7 +46,7 @@ // Instruction class constructor template when OE is set. def template IntOeConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; oeSet = true; @@ -56,7 +56,7 @@ // Instruction class constructor template when both Rc and OE are set. def template IntRcOeConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; rcSet = true; diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/power/isa/formats/mem.isa --- a/src/arch/power/isa/formats/mem.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/power/isa/formats/mem.isa Wed Apr 23 13:06:38 2014 +0100 @@ -64,7 +64,7 @@ def template LoadStoreConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/sparc/isa/formats/basic.isa --- a/src/arch/sparc/isa/formats/basic.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/sparc/isa/formats/basic.isa Wed Apr 23 13:06:38 2014 +0100 @@ -93,7 +93,7 @@ // Basic instruction class constructor template. def template BasicConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; @@ -102,7 +102,7 @@ // Basic instruction class constructor template. def template BasicConstructorWithMnemonic {{ - inline %(class_name)s::%(class_name)s(const char * mnemonic, + %(class_name)s::%(class_name)s(const char * mnemonic, ExtMachInst machInst) : %(base_class)s(mnemonic, machInst, %(op_class)s) { diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/sparc/isa/formats/mem/blockmem.isa --- a/src/arch/sparc/isa/formats/mem/blockmem.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/sparc/isa/formats/mem/blockmem.isa Wed Apr 23 13:06:38 2014 +0100 @@ -240,7 +240,7 @@ // Basic instruction class constructor template. def template BlockMemConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst) { %(constructor)s; @@ -256,7 +256,7 @@ }}; def template BlockMemMicroConstructor {{ - inline %(class_name)s:: + %(class_name)s:: %(class_name)s_%(micro_pc)s:: %(class_name)s_%(micro_pc)s(ExtMachInst machInst) : %(base_class)sMicro("%(mnemonic)s[%(micro_pc)s]", diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/sparc/isa/formats/priv.isa --- a/src/arch/sparc/isa/formats/priv.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/sparc/isa/formats/priv.isa Wed Apr 23 13:06:38 2014 +0100 @@ -186,7 +186,7 @@ }}; def template ControlRegConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s, "%(reg_name)s") { diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/x86/isa/formats/basic.isa --- a/src/arch/x86/isa/formats/basic.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/x86/isa/formats/basic.isa Wed Apr 23 13:06:38 2014 +0100 @@ -68,7 +68,7 @@ // Basic instruction class constructor template. def template BasicConstructor {{ - inline %(class_name)s::%(class_name)s(ExtMachInst machInst) + %(class_name)s::%(class_name)s(ExtMachInst machInst) : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s) { %(constructor)s; diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/x86/isa/macroop.isa --- a/src/arch/x86/isa/macroop.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/x86/isa/macroop.isa Wed Apr 23 13:06:38 2014 +0100 @@ -110,7 +110,7 @@ // Basic instruction class constructor template. def template MacroConstructor {{ - inline X86Macroop::%(class_name)s::%(class_name)s( + X86Macroop::%(class_name)s::%(class_name)s( ExtMachInst machInst, EmulEnv _env) : %(base_class)s("%(mnemonic)s", machInst, %(num_microops)s, _env) { diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/x86/isa/microops/fpop.isa --- a/src/arch/x86/isa/microops/fpop.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/x86/isa/microops/fpop.isa Wed Apr 23 13:06:38 2014 +0100 @@ -88,7 +88,7 @@ }}; def template MicroFpOpConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, InstRegIndex _src1, InstRegIndex _src2, InstRegIndex _dest, uint8_t _dataSize, int8_t _spm) : diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/x86/isa/microops/ldstop.isa --- a/src/arch/x86/isa/microops/ldstop.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/x86/isa/microops/ldstop.isa Wed Apr 23 13:06:38 2014 +0100 @@ -254,7 +254,7 @@ }}; def template MicroLdStOpConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, uint8_t _scale, InstRegIndex _index, InstRegIndex _base, uint64_t _disp, InstRegIndex _segment, diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/x86/isa/microops/limmop.isa --- a/src/arch/x86/isa/microops/limmop.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/x86/isa/microops/limmop.isa Wed Apr 23 13:06:38 2014 +0100 @@ -90,7 +90,7 @@ }}; def template MicroLimmOpConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, InstRegIndex _dest, uint64_t _imm, uint8_t _dataSize) : %(base_class)s(machInst, "%(mnemonic)s", instMnem, diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/x86/isa/microops/mediaop.isa --- a/src/arch/x86/isa/microops/mediaop.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/x86/isa/microops/mediaop.isa Wed Apr 23 13:06:38 2014 +0100 @@ -74,7 +74,7 @@ }}; def template MediaOpRegConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, InstRegIndex _src1, InstRegIndex _src2, InstRegIndex _dest, uint8_t _srcSize, uint8_t _destSize, uint16_t _ext) : @@ -87,7 +87,7 @@ }}; def template MediaOpImmConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, InstRegIndex _src1, uint16_t _imm8, InstRegIndex _dest, uint8_t _srcSize, uint8_t _destSize, uint16_t _ext) : diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/x86/isa/microops/regop.isa --- a/src/arch/x86/isa/microops/regop.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/x86/isa/microops/regop.isa Wed Apr 23 13:06:38 2014 +0100 @@ -130,7 +130,7 @@ }}; def template MicroRegOpConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, InstRegIndex _src1, InstRegIndex _src2, InstRegIndex _dest, uint8_t _dataSize, uint16_t _ext) : @@ -144,7 +144,7 @@ }}; def template MicroRegOpImmConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, InstRegIndex _src1, uint8_t _imm8, InstRegIndex _dest, uint8_t _dataSize, uint16_t _ext) : diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/x86/isa/microops/seqop.isa --- a/src/arch/x86/isa/microops/seqop.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/x86/isa/microops/seqop.isa Wed Apr 23 13:06:38 2014 +0100 @@ -84,7 +84,7 @@ }}; output decoder {{ - inline SeqOpBase::SeqOpBase( + SeqOpBase::SeqOpBase( ExtMachInst machInst, const char * mnemonic, const char * instMnem, uint64_t setFlags, uint16_t _target, uint8_t _cc) : X86MicroopBase(machInst, mnemonic, instMnem, setFlags, No_OpClass), @@ -94,7 +94,7 @@ }}; def template SeqOpConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, uint16_t _target, uint8_t _cc) : %(base_class)s(machInst, "%(mnemonic)s", instMnem, diff -r c17cb21a9df3 -r 32c25dd2122c src/arch/x86/isa/microops/specop.isa --- a/src/arch/x86/isa/microops/specop.isa Wed Apr 23 13:06:28 2014 +0100 +++ b/src/arch/x86/isa/microops/specop.isa Wed Apr 23 13:06:38 2014 +0100 @@ -112,7 +112,7 @@ }}; output decoder {{ - inline MicroFaultBase::MicroFaultBase( + MicroFaultBase::MicroFaultBase( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, Fault _fault, uint8_t _cc) : X86MicroopBase(machInst, "fault", instMnem, setFlags, No_OpClass), @@ -122,7 +122,7 @@ }}; def template MicroFaultConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags, Fault _fault, uint8_t _cc) : %(base_class)s(machInst, instMnem, setFlags, _fault, _cc) @@ -219,7 +219,7 @@ }}; def template MicroFenceOpConstructor {{ - inline %(class_name)s::%(class_name)s( + %(class_name)s::%(class_name)s( ExtMachInst machInst, const char * instMnem, uint64_t setFlags) : %(base_class)s(machInst, "%(mnemonic)s", instMnem, setFlags, %(op_class)s)