Handle ELFCLASS32 files for x86-64

src/trusted/service_runtime/nacl_error_code.h

 /*
  * Copyright (c) 2011 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * NaCl error codes.
  */
 
 #ifndef SERVICE_RUNTIME_NACL_ERROR_CODE_H__
 #define SERVICE_RUNTIME_NACL_ERROR_CODE_H__   1
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 // These error codes are reported via UMA so, if you edit them:
 // 1) make sure you understand UMA, first.
 // 2) update src/tools/histograms/histograms.xml in
 //  svn://svn.chromium.org/chrome-internal/trunk/src-internal
+// 3) never reuse old numbers for a different meaning; add new ones on the end
 // Values are explicitly specified to make sure they don't shift around when
 // edited, and also to make reading about:histograms easier.
 typedef enum NaClErrorCode {
   LOAD_OK = 0,
   LOAD_STATUS_UNKNOWN = 1,  /* load status not available yet */
   LOAD_UNSUPPORTED_OS_PLATFORM = 2,
   LOAD_DEP_UNSUPPORTED = 3,
   LOAD_INTERNAL = 4,
   LOAD_DUP_LOAD_MODULE = 5,
   LOAD_DUP_START_MODULE = 6,
   LOAD_OPEN_ERROR = 7,
   LOAD_READ_ERROR = 8,
   LOAD_TOO_MANY_PROG_HDRS = 9,
-  LOAD_PROG_HDR_SIZE_TOO_SMALL = 10,
+  LOAD_BAD_PHENTSIZE = 10,
   LOAD_BAD_ELF_MAGIC = 11,
   LOAD_NOT_32_BIT = 12,
   LOAD_NOT_64_BIT = 13,
   LOAD_BAD_ABI = 14,
   LOAD_NOT_EXEC = 15,
   LOAD_BAD_MACHINE = 16,
   LOAD_BAD_ELF_VERS = 17,
   LOAD_TOO_MANY_SECT = 18,
   LOAD_BAD_SECT = 19,
   LOAD_NO_MEMORY = 20,
@@ skipping 31 matching lines @@
   LOAD_DUP_SEGMENT = 52,
   LOAD_SEGMENT_BAD_LOC = 53,
   LOAD_BAD_SEGMENT = 54,
   LOAD_REQUIRED_SEG_MISSING = 55,
   LOAD_SEGMENT_BAD_PARAM = 56,
   LOAD_VALIDATION_FAILED = 57,
   LOAD_UNIMPLEMENTED = 58,
   /*
    * service runtime errors (post load, during startup phase)
    */
-  SRT_NO_SEG_SEL = 59
+  SRT_NO_SEG_SEL = 59,
+
+  LOAD_BAD_EHSIZE = 60,
+  LOAD_EHDR_OVERFLOW = 61,
+  LOAD_PHDR_OVERFLOW = 62
 } NaClErrorCode;
-#define NACL_ERROR_CODE_MAX (SRT_NO_SEG_SEL+1)
+
+#define NACL_ERROR_CODE_MAX (LOAD_PHDR_OVERFLOW + 1)
 
 char const  *NaClErrorString(NaClErrorCode  errcode);
 
 #ifdef __cplusplus
 }  /* end of extern "C" */
 #endif
 
 #endif