diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-01 19:34:51 -0800 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-01 19:34:51 -0800 |
| commit | 745f0044cd65d476b3b190377989eb0af3738df5 (patch) | |
| tree | bc29a2944891cdfa20edeebe80e3a4ea08c0e3a7 /base/loader/object_file.cc | |
| parent | 5b24b5a5c5d336eb1594e65826caf2a28da3ede1 (diff) | |
| parent | 7976794aadd7f308010f88aa3a8a6e3469e37ba7 (diff) | |
| download | gem5-745f0044cd65d476b3b190377989eb0af3738df5.tar.xz | |
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : d66ebc598fdcfc9477ea5a1e455b21d7b9e56936
Diffstat (limited to 'base/loader/object_file.cc')
| -rw-r--r-- | base/loader/object_file.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/loader/object_file.cc b/base/loader/object_file.cc index 5a13d180c..25e9b2d19 100644 --- a/base/loader/object_file.cc +++ b/base/loader/object_file.cc @@ -46,8 +46,10 @@ using namespace std; ObjectFile::ObjectFile(const string &_filename, int _fd, - size_t _len, uint8_t *_data) - : filename(_filename), descriptor(_fd), fileData(_data), len(_len) + size_t _len, uint8_t *_data, + Arch _arch, OpSys _opSys) + : filename(_filename), descriptor(_fd), fileData(_data), len(_len), + arch(_arch), opSys(_opSys) { } |