run: forward --gem5-worktree to tmux

This commit is contained in:
Ciro Santilli 六四事件 法轮功
2020-01-21 00:00:00 +00:00
parent 9fbe39542d
commit 57ead1bd2d

8
run
View File

@@ -790,7 +790,10 @@ Extra options to append at the end of the emulator command line.
'-cpu', cpu, LF, '-cpu', cpu, LF,
]) ])
if self.env['tmux']: 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['tmux_program'] == 'shell':
if self.env['emulator'] == 'gem5': if self.env['emulator'] == 'gem5':
tmux_cmd = os.path.join(self.env['root_dir'], 'gem5-shell') 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 # Part of me wants to: https://github.com/jonathanslenders/pymux
# but it cannot be used as a library properly it seems, and it is # but it cannot be used as a library properly it seems, and it is
# slower than tmux. # 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['arch'],
self.env['emulator'], self.env['emulator'],
self.env['gcc_which'], self.env['gcc_which'],
self.env['linux_build_id'], self.env['linux_build_id'],
self.env['run_id'],
self.env['userland_build_id'], self.env['userland_build_id'],
) )
if self.env['baremetal']: if self.env['baremetal']: