From: Gabe Black <gabeblack@google.com>
Date: Tue, 3 Dec 2019 01:50:38 +0000 (-0800)
Subject: systemc,fastmodel: Use the gem5_scons error and warning functions.
X-Git-Tag: v19.0.0.0~238
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5203b88eac6eed12674327c5cd0ac658a27573b;p=gem5.git

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 <giacomo.travaglini@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

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.
diff --git a/src/systemc/SConsopts b/src/systemc/SConsopts
index 172de5724..4e57fd4c1 100644
--- a/src/systemc/SConsopts
+++ b/src/systemc/SConsopts
@@ -28,20 +28,18 @@
 Import('*')
 
 from m5.util import compareVersions
-from m5.util.terminal import termcap
+
+from gem5_scons import warning
 
 def use_systemc_check(env, warn=False):
     if ('GCC_VERSION' in env and
             compareVersions(env['GCC_VERSION'], '5.0') < 0):
         if warn:
-            print(termcap.Yellow + termcap.Bold +
-                  'Warning: Systemc may not work on gcc versions less '
-                  'than 5.0.' + termcap.Normal)
+            warning('Systemc may not work on gcc versions less than 5.0.')
         return False
     elif env['PLATFORM'] == 'darwin':
         if warn:
-            print(termcap.Yellow + termcap.Bold +
-                  'Warning: Systemc may not work on Mac OS.' + termcap.Normal)
+            warning('Warning: Systemc may not work on Mac OS.')
         return False
     return True