sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base: Output all AddrRange parameters to config.ini

Browse source 
Currently only 'start' and 'end' of AddrRange are printed in config.ini.
This causes address ranges to be overlapping when loading a c++-only
config with interleaved addresses using CxxConfigManger. This patch adds
prints for the interleave and XOR bits to config.ini such that address
ranges are properly setup with cxx config.
This commit is contained in:
Matt Poremba 2016-09-13 23:06:18 -04:00
parent 3329de1e86
commit 4c903d0412
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/python/m5/params.py
View file

@ -778,7 +778,9 @@ class AddrRange(ParamValue):
raise TypeError, "Too many keywords: %s" % kwargs.keys() raise TypeError, "Too many keywords: %s" % kwargs.keys()
def __str__(self): def __str__(self):
return '%s:%s' % (self.start, self.end) return '%s:%s:%s:%s:%s:%s' \
% (self.start, self.end, self.intlvHighBit, self.xorHighBit,\
self.intlvBits, self.intlvMatch)
def size(self): def size(self):
# Divide the size by the size of the interleaving slice # Divide the size by the size of the interleaving slice
@ -799,16 +801,28 @@ class AddrRange(ParamValue):
@classmethod @classmethod
def cxx_ini_parse(cls, code, src, dest, ret): def cxx_ini_parse(cls, code, src, dest, ret):
code('uint64_t _start, _end;') code('uint64_t _start, _end, _intlvHighBit = 0, _xorHighBit = 0;')
code('uint64_t _intlvBits = 0, _intlvMatch = 0;')
code('char _sep;') code('char _sep;')
code('std::istringstream _stream(${src});') code('std::istringstream _stream(${src});')
code('_stream >> _start;') code('_stream >> _start;')
code('_stream.get(_sep);') code('_stream.get(_sep);')
code('_stream >> _end;') code('_stream >> _end;')
code('if (!_stream.fail() && !_stream.eof()) {')
code(' _stream.get(_sep);')
code(' _stream >> _intlvHighBit;')
code(' _stream.get(_sep);')
code(' _stream >> _xorHighBit;')
code(' _stream.get(_sep);')
code(' _stream >> _intlvBits;')
code(' _stream.get(_sep);')
code(' _stream >> _intlvMatch;')
code('}')
code('bool _ret = !_stream.fail() &&' code('bool _ret = !_stream.fail() &&'
'_stream.eof() && _sep == \':\';') '_stream.eof() && _sep == \':\';')
code('if (_ret)') code('if (_ret)')
code(' ${dest} = AddrRange(_start, _end);') code(' ${dest} = AddrRange(_start, _end, _intlvHighBit, \
_xorHighBit, _intlvBits, _intlvMatch);')
code('${ret} _ret;') code('${ret} _ret;')
def getValue(self): def getValue(self):