Support for MIPS in architecture independent files....

SConstruct

 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 155 matching lines @@
       'CCFLAGS':      ['-m32'],
       'LINKFLAGS':    ['-m32']
     },
     'arch:arm': {
       'CPPDEFINES':   ['V8_TARGET_ARCH_ARM']
     },
     'simulator:arm': {
       'CCFLAGS':      ['-m32'],
       'LINKFLAGS':    ['-m32']
     },
+    'arch:mips': {

[Søren Thygesen Gjesse, 2010/01/20 15:30:28]

If you change this section to

      'CPPDEFINES':   ['V8_TARGET_ARCH_MIPS'],
      'simulator:none': {
        'CCFLAGS':      ['-EL', '-mips32r2', '-Wa,-mips32r2', '-fno-inline'],
        'LDFLAGS':      ['-EL']
      }

The flags for the MIPS gcc will now only become active when not compiling for
the simulator.

[Alexandre, 2010/01/22 23:08:42]

Applied this change.
On 2010/01/20 15:30:28, Søren Gjesse wrote:

+      'CPPDEFINES':   ['V8_TARGET_ARCH_MIPS'],
+      'CCFLAGS':      ['-EL', '-mips32r2', '-Wa,-mips32r2', '-fno-inline'],
+      'LDFLAGS':      ['-EL']
+    },
+    'simulator:mips': {
+      'CCFLAGS':      ['-m32'],
+      'LINKFLAGS':    ['-m32']
+    },
+    'arch:mips-simu': {

[Søren Thygesen Gjesse, 2010/01/20 15:30:28]

With the change to arch:mips above the pseudo arch mips-simu is no longer
needed.

[Alexandre, 2010/01/22 23:08:42]

mips-simu arch removed
On 2010/01/20 15:30:28, Søren Gjesse wrote:

+      'CPPDEFINES':   ['V8_TARGET_ARCH_MIPS', 'NO_NATIVES', 'MIPS_SIMU'],
+      'CCFLAGS':      [],
+    },
     'arch:x64': {
       'CPPDEFINES':   ['V8_TARGET_ARCH_X64'],
       'CCFLAGS':      ['-m64'],
       'LINKFLAGS':    ['-m64'],
     },
     'prof:oprofile': {
       'CPPDEFINES':   ['ENABLE_OPROFILE_AGENT']
     }
   },
   'msvc': {
@@ skipping 88 matching lines @@
     },
     'arch:x64': {
       'WARNINGFLAGS': ['/W2']
     },
     'arch:arm': {
       'CPPDEFINES':   ['V8_TARGET_ARCH_ARM'],
       # /wd4996 is to silence the warning about sscanf
       # used by the arm simulator.
       'WARNINGFLAGS': ['/wd4996']
     },
+    'arch:mips': {
+      'CPPDEFINES':   ['V8_TARGET_ARCH_MIPS'],
+    },
+    'arch:mips-simu': {

[Søren Thygesen Gjesse, 2010/01/20 15:30:28]

With the change to arch:mips above the pseudo arch mips-simu is no longer
needed.

[Alexandre, 2010/01/22 23:08:42]

mips-simu arch removed
On 2010/01/20 15:30:28, Søren Gjesse wrote:

+      'CPPDEFINES':   ['V8_TARGET_ARCH_MIPS', 'NO_NATIVES', 'MIPS_SIMU'],

[Søren Thygesen Gjesse, 2010/01/20 15:30:28]

There is no active use of defines NO_NATIVES and MIPS_SIMU in the code.

[Alexandre, 2010/01/22 23:08:42]

Removed
On 2010/01/20 15:30:28, Søren Gjesse wrote:

+    },
     'disassembler:on': {
       'CPPDEFINES':   ['ENABLE_DISASSEMBLER']
     }
   }
 }
 
 
 MKSNAPSHOT_EXTRA_FLAGS = {
   'gcc': {
     'os:linux': {
@@ skipping 122 matching lines @@
       }
     },
     'arch:ia32': {
       'CCFLAGS':      ['-m32'],
       'LINKFLAGS':    ['-m32']
     },
     'arch:x64': {
       'CCFLAGS':      ['-m64'],
       'LINKFLAGS':    ['-m64']
     },
+    'arch:mips': {

[Søren Thygesen Gjesse, 2010/01/20 15:30:28]

Change this section like this:

      'CPPDEFINES':   ['V8_TARGET_ARCH_MIPS'],
      'simulator:none': {
        'CCFLAGS':      ['-EL', '-mips32r2', '-Wa,-mips32r2', '-fno-inline'],
        'LINKFLAGS':    ['-EL'],
        'LDFLAGS':      ['-EL']
      }

[Alexandre, 2010/01/22 23:08:42]

Applied the changes.
On 2010/01/20 15:30:28, Søren Gjesse wrote:

+      'CPPDEFINES':   ['V8_TARGET_ARCH_MIPS'],
+      'CCFLAGS':      ['-EL', '-mips32r2', '-Wa,-mips32r2', '-fno-inline'],
+      'LINKFLAGS':    ['-EL'],
+      'LDFLAGS':      ['-EL']
+    },
+    'arch:mips-simu': {

[Søren Thygesen Gjesse, 2010/01/20 15:30:28]

With the change to arch:mips above the pseudo arch mips-simu is no longer
needed.

[Alexandre, 2010/01/22 23:08:42]

mips-simu arch removed
On 2010/01/20 15:30:28, Søren Gjesse wrote:

+      'CPPDEFINES':   ['V8_TARGET_ARCH_MIPS', 'NO_NATIVES', 'MIPS_SIMU'],
+      'CCFLAGS':      [],
+    },
     'simulator:arm': {
       'CCFLAGS':      ['-m32'],
       'LINKFLAGS':    ['-m32']
     },
+    'simulator:mips': {
+      'CCFLAGS':      ['-m32'],
+      'LINKFLAGS':    ['-m32']
+    },
     'mode:release': {
       'CCFLAGS':      ['-O2']
     },
     'mode:debug': {
       'CCFLAGS':      ['-g', '-O0']
     },
     'prof:oprofile': {
       'LIBPATH': ['/usr/lib32', '/usr/lib32/oprofile'],
       'LIBS': ['opagent']
     }
@@ skipping 113 matching lines @@
     'values': ['gcc', 'msvc'],
     'default': TOOLCHAIN_GUESS,
     'help': 'the toolchain to use (' + TOOLCHAIN_GUESS + ')'
   },
   'os': {
     'values': ['freebsd', 'linux', 'macos', 'win32', 'android'],
     'default': OS_GUESS,
     'help': 'the os to build for (' + OS_GUESS + ')'
   },
   'arch': {
-    'values':['arm', 'ia32', 'x64'],
+    'values':['arm', 'ia32', 'x64', 'mips'],
     'default': ARCH_GUESS,
     'help': 'the architecture to build for (' + ARCH_GUESS + ')'
   },
   'regexp': {
     'values': ['native', 'interpreted'],
     'default': 'native',
     'help': 'Whether to use native or interpreted regexp implementation'
   },
   'snapshot': {
     'values': ['on', 'off', 'nobuild'],
@@ skipping 29 matching lines @@
     'values': ['static', 'shared'],
     'default': 'static',
     'help': 'the type of Microsoft Visual C++ runtime library to use'
   },
   'msvcltcg': {
     'values': ['on', 'off'],
     'default': 'on',
     'help': 'use Microsoft Visual C++ link-time code generation'
   },
   'simulator': {
-    'values': ['arm', 'none'],
+    'values': ['arm', 'mips', 'none'],
     'default': 'none',
     'help': 'build with simulator'
   },
   'disassembler': {
     'values': ['on', 'off'],
     'default': 'off',
     'help': 'enable the disassembler to inspect generated code'
   },
   'sourcesignatures': {
     'values': ['MD5', 'timestamp'],
@@ skipping 127 matching lines @@
     self.build_snapshot = (options['snapshot'] == 'on')
     self.flags = None
 
   def AddRelevantFlags(self, initial, flags):
     result = initial.copy()
     toolchain = self.options['toolchain']
     if toolchain in flags:
       self.AppendFlags(result, flags[toolchain].get('all'))
       for option in sorted(self.options.keys()):
         value = self.options[option]
+        # On MIPS the flags needed to compile for the HW board are not accepted by gcc
+                # when compiling for x86.
+        if (self.options['simulator'] == 'mips' and value == 'mips'): value = 'mips-simu'

[Søren Thygesen Gjesse, 2010/01/20 15:30:28]

This seems wrong. It will overwrite both the value of 'arch' and the value of
'simulator'. This in turn causes the gcc section simulator:mips to be ignored so
the -m32 option are missing when compiling on a 64-bit linux.

With changes above this should not be needed any more.

[Alexandre, 2010/01/22 23:08:42]

Removed.
On 2010/01/20 15:30:28, Søren Gjesse wrote:

         self.AppendFlags(result, flags[toolchain].get(option + ':' + value))
     self.AppendFlags(result, flags.get('all'))
     return result
 
   def AddRelevantSubFlags(self, options, flags):
     self.AppendFlags(options, flags.get('all'))
     for option in sorted(self.options.keys()):
       value = self.options[option]
       self.AppendFlags(options, flags.get(option + ':' + value))
 
@@ skipping 39 matching lines @@
       env['ENV'] = self.env_overrides
 
 
 def PostprocessOptions(options):
   # Adjust architecture if the simulator option has been set
   if (options['simulator'] != 'none') and (options['arch'] != options['simulator']):
     if 'arch' in ARGUMENTS:
       # Print a warning if arch has explicitly been set
       print "Warning: forcing architecture to match simulator (%s)" % options['simulator']
     options['arch'] = options['simulator']
+#    # On MIPS we can't keep mips arch flags when building the emulator
+#    if (options['simulator'] == 'mips-simu')
+#      print "Warning: Don't pay attention to the previous warning. (building mips simulator)"
+#      options['arch'] = 'mips'

[Søren Thygesen Gjesse, 2010/01/20 15:30:28]

Chis change should not be needed when the pseudo architecture mips-simu gets
removed.

[Alexandre, 2010/01/22 23:08:42]

Removed.
On 2010/01/20 15:30:28, Søren Gjesse wrote:

   if (options['prof'] != 'off') and (options['profilingsupport'] == 'off'):
     # Print a warning if profiling is enabled without profiling support
     print "Warning: forcing profilingsupport on when prof is on"
     options['profilingsupport'] = 'on'
 
 
 def ParseEnvOverrides(arg, imports):
   # The environment overrides are in the format NAME0:value0,NAME1:value1,...
   # The environment imports are in the format NAME0,NAME1,...
   overrides = {}
@@ skipping 152 matching lines @@
 # version of scons.  Also, there's a bug in some revisions that
 # doesn't allow this flag to be set, so we swallow any exceptions.
 # Lovely.
 try:
   SetOption('warn', 'no-deprecated')
 except:
   pass
 
 
 Build()