From 57ead1bd2d90bfd031893de4c9451e0fcecd1e5b 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: Tue, 21 Jan 2020 00:00:00 +0000 Subject: [PATCH] run: forward --gem5-worktree to tmux --- run | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/run b/run index 9d1a79b..852937d 100755 --- a/run +++ b/run @@ -790,7 +790,10 @@ Extra options to append at the end of the emulator command line. '-cpu', cpu, LF, ]) if self.env['tmux']: - tmux_args = '--run-id {}'.format(self.env['run_id']) + tmux_args = "--gem5-worktree '{}' --run-id {}".format( + self.env['gem5_worktree'], + self.env['run_id'] + ) if self.env['tmux_program'] == 'shell': if self.env['emulator'] == 'gem5': tmux_cmd = os.path.join(self.env['root_dir'], 'gem5-shell') @@ -802,12 +805,11 @@ Extra options to append at the end of the emulator command line. # Part of me wants to: https://github.com/jonathanslenders/pymux # but it cannot be used as a library properly it seems, and it is # slower than tmux. - tmux_args += " --arch {} --emulator '{}' --gcc-which '{}' --linux-build-id '{}' --run-id '{}' --userland-build-id '{}'".format( + tmux_args += " --arch {} --emulator '{}' --gcc-which '{}' --linux-build-id '{}' --userland-build-id '{}'".format( self.env['arch'], self.env['emulator'], self.env['gcc_which'], self.env['linux_build_id'], - self.env['run_id'], self.env['userland_build_id'], ) if self.env['baremetal']: