From ba49c4a37ecd182493d9e3f9d770cf866fc3b69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= Date: Wed, 11 Mar 2020 00:00:00 +0000 Subject: [PATCH] gem5: fix run which had removed --bootloader and --interp At 1f007b2004b14a71ac8d29b8af4bb0670504cb47 I accidentally removed them while doing a temporary test. --- run | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/run b/run index 01865b6..fe779c5 100755 --- a/run +++ b/run @@ -517,6 +517,17 @@ Extra options to append at the end of the emulator command line. ]) if self.env['userland_args'] is not None: cmd.extend(['--options', self.env['userland_args'], LF]) + if not self.env['static']: + for path in self.env['userland_library_redirects']: + cmd.extend([ + '--redirects', + '{}={}'.format( + os.sep + path, + os.path.join(self.env['userland_library_dir'], path) + ), + LF + ]) + cmd.extend(['--interp-dir', self.env['userland_library_dir'], LF]) else: if self.env['gem5_script'] == 'fs': cmd.extend([ @@ -610,6 +621,9 @@ Extra options to append at the end of the emulator command line. ), LF ]) + if self.env['gem5_script'] == 'fs' or self.env['gem5_script'] == 'biglittle': + if self.env['gem5_bootloader'] is not None: + cmd.extend(['--bootloader', self.env['gem5_bootloader'], LF]) cmd.extend(['--mem-size', memory, LF]) if self.env['gdb_wait']: # https://stackoverflow.com/questions/49296092/how-to-make-gem5-wait-for-gdb-to-connect-to-reliably-break-at-start-kernel-of-th