Fixes some bugs with memory setup and halt-sled allocation and...

tools/set_abi_version.py

 #!/usr/bin/python
 # Copyright 2008, Google Inc.
 # 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.
@@ skipping 14 matching lines @@
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 import getopt
 import sys
 
+import nacl_elf_constants
+
 
 """Changes the OS ABI number of Native Client executables.
 
 This module contains code for updating the OS ABI version number of
 Native Client executables.  This is needed, for example, for changing
 the bad executables checked into the service runtime test data
 directory -- those executables were the result of hand editing of ELF
 headers, since such bad executables cannot be created with our
 toolchain.
 
 """
 
+ELF_OSABI_OFFSET = 7
 ELF_ABIVERSION_OFFSET = 8
 
+OS_NUMBER_NACL = 123
 
-def SetOsAbiVersion(elf_file_data, version):
+
+def SetOsAbiVersion(elf_file_data, os_number, abi_version):
   """Change the OS ABI number of a string, interpreted as an NaCl executable.
 
   Args:
     elf_file_data: the ELF NaCl executable (as a string)
     version: the desired version number (as an integer)
 
   Returns:
     Updated ELF NaCl executable.
   """
-  return (elf_file_data[:ELF_ABIVERSION_OFFSET]
-          + chr(version) + elf_file_data[ELF_ABIVERSION_OFFSET + 1:])
+  data = elf_file_data
+
+  data = (data[:ELF_OSABI_OFFSET]
+          + chr(os_number) + data[ELF_OSABI_OFFSET + 1:])
+  data = (data[:ELF_ABIVERSION_OFFSET]
+          + chr(abi_version) + data[ELF_ABIVERSION_OFFSET + 1:])
+  return data
 #enddef
 
 
-def ModifyFileOsAbiVersion(filename, version):
+def ModifyFileOsAbiVersion(filename, os_number, abi_version):
   """Changes the OS ABI number of the named file.
 
   No sanity checking is done on the file's contents to verify that it
   indeed is an ELF NaCl executable.
 
   Args:
     filename: the file to be modified.
     version: the new OS ABI version number.
 
   Returns:  nothing.
 
   Throws: IOError if file does not exist or cannot be written.
 
   """
   file_data = open(filename, 'rb').read()
-  open(filename, 'wb').write(SetOsAbiVersion(file_data, version))
+  open(filename, 'wb').write(SetOsAbiVersion(file_data,
+                                             os_number, abi_version))
 # enddef
 
 
 def ReadFileOsAbiVersion(filename):
   """Read the named ELF NaCl executable and return its OS ABI version number.
 
   Args:
     filename:  the file from which the OS ABI number is extracted.
 
   Returns:
     The OS ABI version number (as an integer).
   """
   return ord(open(filename, 'rb').read()[ELF_ABIVERSION_OFFSET])
 #enddef
 
 
 def main(argv):
   abi_version = -1
   try:
-    (opts, args) = getopt.getopt(argv[1:], 'v:')
+    (opts, args) = getopt.getopt(argv[1:], 'c:v:')
   except getopt.error, e:
     print >>sys.stderr, str(e)
     print >>sys.stderr, 'Usage: set_abi_version [-v version_num] filename...'
     return 1
   # endtry
+
+  os_number = OS_NUMBER_NACL  # default
+
   for opt, val in opts:
-    if opt == '-v':
+    if opt == '-c':
+      const_dict = nacl_elf_constants.GetNaClElfConstants(val)
+      os_number = const_dict['ELFOSABI_NACL']
+      abi_version = const_dict['EF_NACL_ABIVERSION']
+    elif opt == '-v':
       abi_version = int(val)
     # endif
   # endfor
 
   for filename in args:
     if abi_version == -1:
       new_abi = 1 + ReadFileOsAbiVersion(filename)
     else:
       new_abi = abi_version
     # endif
 
-    ModifyFileOsAbiVersion(filename, new_abi)
+    ModifyFileOsAbiVersion(filename, os_number, new_abi)
   # endfor
 
   return 0
 # enddef
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))
 # endif