diff options
| author | Korey Sewell <ksewell@umich.edu> | 2009-02-10 15:49:29 -0800 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2009-02-10 15:49:29 -0800 |
| commit | 2d0a66cbc123fc345deb070c323130382518f367 (patch) | |
| tree | 6f52928b6ffce6fb56c26f543961b12cd9f5d0f4 /src/cpu/SConscript | |
| parent | 20c5ec6e1cb52d9e0f39d50bb254bffda139c4ea (diff) | |
| download | gem5-2d0a66cbc123fc345deb070c323130382518f367.tar.xz | |
CPU: Prepare CPU models for the new in-order CPU model.
Some new functions and forward declarations are necessary to make things work
Diffstat (limited to 'src/cpu/SConscript')
| -rw-r--r-- | src/cpu/SConscript | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/cpu/SConscript b/src/cpu/SConscript index f210cec9b..eee8edca4 100644 --- a/src/cpu/SConscript +++ b/src/cpu/SConscript @@ -48,12 +48,14 @@ execfile(models_db.srcnode().abspath) # Template for execute() signature. exec_sig_template = ''' -virtual Fault execute(%s *xc, Trace::InstRecord *traceData) const = 0; -virtual Fault initiateAcc(%s *xc, Trace::InstRecord *traceData) const +virtual Fault execute(%(type)s *xc, Trace::InstRecord *traceData) const = 0; +virtual Fault initiateAcc(%(type)s *xc, Trace::InstRecord *traceData) const { panic("initiateAcc not defined!"); M5_DUMMY_RETURN }; -virtual Fault completeAcc(Packet *pkt, %s *xc, +virtual Fault completeAcc(Packet *pkt, %(type)s *xc, Trace::InstRecord *traceData) const { panic("completeAcc not defined!"); M5_DUMMY_RETURN }; +virtual int memAccSize(%(type)s *xc) +{ panic("memAccSize not defined!"); M5_DUMMY_RETURN }; ''' mem_ini_sig_template = ''' @@ -82,7 +84,7 @@ def gen_cpu_exec_signatures(target, source, env): ''' for cpu in temp_cpu_list: xc_type = CpuModel.dict[cpu].strings['CPU_exec_context'] - print >> f, exec_sig_template % (xc_type, xc_type, xc_type) + print >> f, exec_sig_template % { 'type' : xc_type } print >> f, ''' #endif // __CPU_STATIC_INST_EXEC_SIGS_HH__ ''' |