From e5203b88eac6eed12674327c5cd0ac658a27573b Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 2 Dec 2019 17:50:38 -0800 Subject: systemc,fastmodel: Use the gem5_scons error and warning functions. Use them in place of messing with termcap directly. Change-Id: I093efa95e6b6ea7af198dc1395dce05ca6d6575f Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23263 Reviewed-by: Giacomo Travaglini Maintainer: Gabe Black Tested-by: kokoro --- src/arch/arm/fastmodel/SConscript | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/arch') diff --git a/src/arch/arm/fastmodel/SConscript b/src/arch/arm/fastmodel/SConscript index e4c95900b..2cd577dcd 100644 --- a/src/arch/arm/fastmodel/SConscript +++ b/src/arch/arm/fastmodel/SConscript @@ -29,18 +29,15 @@ from __future__ import print_function Import('*') -from m5.util.terminal import termcap from m5.util.grammar import Grammar -from gem5_scons import Transform +from gem5_scons import Transform, warning, error import os.path if env['USE_ARM_FASTMODEL']: if not env['USE_SYSTEMC']: - print(termcap.Yellow + termcap.Bold + - 'Warning: ARM Fast Models require systemc support' + - termcap.Normal) + warning('ARM Fast Models require systemc support') env['USE_ARM_FASTMODEL'] = False Return() @@ -53,10 +50,7 @@ env['ENV']['SYSTEMC_HOME'] = systemc_home.abspath def extract_var(name): if name not in env: - print(termcap.Red + termcap.Bold + - ('Error: %s is not set' % name) + - termcap.Normal) - Exit(1) + error('Error: %s is not set' % name) print('%s = %s' % (name, env[name])) # Make sure the value of this variable shows up as an environment variable # for commands scons runs. -- cgit v1.2.3