From 1c041364971da5e39f29e548c20b210bb3444370 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: Mon, 6 Apr 2020 01:00:00 +0000 Subject: [PATCH] gem5 X86: fix Exception: unknown machine: TODO --- common.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/common.py b/common.py index 6947d7f..67e9931 100644 --- a/common.py +++ b/common.py @@ -1068,14 +1068,15 @@ Incompatible archs are skipped. env['baremetal_syscalls_basename_noext'] + '_asm' + env['obj_ext'] ) if env['emulator'] == 'gem5': - if env['machine'] == 'VExpress_GEM5_V1': - env['entry_address'] = 0x80000000 - env['uart_address'] = 0x1c090000 - elif env['machine'] == 'RealViewPBX': - env['entry_address'] = 0x10000 - env['uart_address'] = 0x10009000 - else: - raise Exception('unknown machine: ' + env['machine']) + if self.env['is_arm']: + if env['machine'] == 'VExpress_GEM5_V1': + env['entry_address'] = 0x80000000 + env['uart_address'] = 0x1c090000 + elif env['machine'] == 'RealViewPBX': + env['entry_address'] = 0x10000 + env['uart_address'] = 0x10009000 + else: + raise Exception('unknown machine: ' + env['machine']) else: env['entry_address'] = 0x40000000 env['uart_address'] = 0x09000000