derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: fix line lengths and include ordering

Browse Source 
The style checker complains about line length and ordering for these
files. This fix should make these two files kosher.

Change-Id: I822a0518a98d9e379a543d2017e90c4e9666a58d
Reviewed-on: https://gem5-review.googlesource.com/3380
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Brandon Potter <Brandon.Potter@amd.com>
This commit is contained in:
Brandon Potter
2017-05-15 15:13:19 -05:00
committed by Brandon Potter
parent c8c406bc30
commit f44ddb94a6
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/python/m5/SimObject.py
View File

@@ -477,7 +477,8 @@ class MetaSimObject(type):
if isinstance(c, MetaSimObject):
bTotal += 1
if bTotal > 1:
raise TypeError, "SimObjects do not support multiple inheritance"
raise TypeError, \
"SimObjects do not support multiple inheritance"
base = bases[0]
@@ -679,9 +680,10 @@ class MetaSimObject(type):
code('''#include "pybind11/pybind11.h"
#include "pybind11/stl.h"
#include "sim/sim_object.hh"
#include "params/$cls.hh"
#include "sim/init.hh"
#include "sim/sim_object.hh"
#include "${{cls.cxx_header}}"
''')
@@ -982,7 +984,8 @@ class SimObject(object):
if keys in self._hr_values\
and keys in self._values\
and not isinstance(self._values[keys], m5.proxy.BaseProxy):
and not isinstance(self._values[keys],
m5.proxy.BaseProxy):
cmd_str = cmd_line_str + keys
acc_str = access_str + keys
flags_dict[cmd_str] = ParamInfo(ptype,
@@ -1182,8 +1185,9 @@ class SimObject(object):
self._parent = parent
self._name = name
# Return parent object of this SimObject, not implemented by SimObjectVector
# because the elements in a SimObjectVector may not share the same parent
# Return parent object of this SimObject, not implemented by
# SimObjectVector because the elements in a SimObjectVector may not share
# the same parent
def get_parent(self):
return self._parent
@@ -1275,7 +1279,8 @@ class SimObject(object):
match_obj = self._values[pname]
if found_obj != None and found_obj != match_obj:
raise AttributeError, \
'parent.any matched more than one: %s and %s' % (found_obj.path, match_obj.path)
'parent.any matched more than one: %s and %s' % \
(found_obj.path, match_obj.path)
found_obj = match_obj
return found_obj, found_obj != None

7
util/m5/m5.c
View File

@@ -43,6 +43,7 @@
#ifdef linux
#define _GNU_SOURCE
#include <sched.h>
#endif
#include <err.h>
@@ -348,7 +349,8 @@ struct MainFunc mainfuncs[] = {
{ "checkpoint", do_checkpoint, "[delay [period]]" },
{ "addsymbol", do_addsymbol, "<address> <symbol>" },
{ "loadsymbol", do_loadsymbol, "" },
{ "initparam", do_initparam, "[key] // key must be shorter than 16 chars" },
{ "initparam", do_initparam, "[key] // key must be shorter"
" than 16 chars" },
{ "sw99param", do_sw99param, "" },
#ifdef linux
{ "pin", do_pin, "<cpu> <program> [args ...]" }
@@ -384,7 +386,8 @@ map_m5_mem()
exit(1);
}
m5_mem = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd, M5OP_ADDR);
m5_mem = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
M5OP_ADDR);
if (!m5_mem) {
perror("Can't mmap /dev/mem");
exit(1);