Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/validator_arm/ncval.cc

 /*
  * 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.
  */
 
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 
@@ skipping 33 matching lines @@
         problem_code.c_str(), ref_vaddr);
   }
   virtual bool should_continue() {
     // Collect *all* problems before returning!
     return true;
   }
 };
 
 const uint32_t kOneGig = 1U * 1024 * 1024 * 1024;
 
-int validate(const ncfile *ncf, bool use_zero_masks) {
+int validate(const ncfile *ncf, bool use_zero_masks, bool thumb) {

[Karl, 2011/09/19 19:56:05]

Should this be static?

[bsy, 2011/09/21 22:32:17]

since this is C++ code, put this in a namespace?

[jasonwkim, 2011/09/26 21:35:52]

since this code is already only called by main, probably not worth it?

[jasonwkim, 2011/09/26 21:35:52]

only called by main - I think its fine

+  nacl_arm_dec::RegisterList roRegs = nacl_arm_dec::Register(9);
+  if (thumb) {

[Karl, 2011/09/19 19:56:05]

Thumb2?

[jasonwkim, 2011/09/26 21:35:52]

again thumb mode

+     roRegs = nacl_arm_dec::kRegisterListNothing;
+  }
   SfiValidator validator(
       16,  // bytes per bundle
       // TODO(cbiffle): maybe check region sizes from ELF headers?
       //                verify that instructions are in right region
       kOneGig,  // code region size
       kOneGig,  // data region size
-      nacl_arm_dec::Register(9),  // read only register (used for threading)
-      nacl_arm_dec::Register(13));  // stack pointer
+      roRegs,  // read only register (used for threading)
+      nacl_arm_dec::Register(13),  // stack pointer
+      thumb);
 
   if (use_zero_masks) {
-    validator.change_masks(0, 0);
+    validator.change_masks(0, 0, 0);
   }
 
   CommandLineProblemSink sink;
 
   Elf_Shdr *shdr = ncf->sheaders;
 
   vector<CodeSegment> segments;
   for (int i = 0; i < ncf->shnum; i++) {
     if ((shdr[i].sh_flags & SHF_EXECINSTR) != SHF_EXECINSTR) {
       continue;
     }
-
+  fprintf(stderr, "CodeSegment(%x, %x, %x)\n", (unsigned int)(ncf->data + (shdr[i].sh_addr - ncf->vbase)),

[Karl, 2011/09/19 19:56:05]

Should this have a DEBUG prefix like line 126?

[jasonwkim, 2011/09/26 21:35:52]

debug printfs killed

+        shdr[i].sh_addr, shdr[i].sh_size);
     CodeSegment segment(ncf->data + (shdr[i].sh_addr - ncf->vbase),
         shdr[i].sh_addr, shdr[i].sh_size);
     segments.push_back(segment);
   }
 
   std::sort(segments.begin(), segments.end());
 
   bool success = validator.validate(segments, &sink);
   if (!success) return 1;
   return 0;
@@ skipping 22 matching lines @@
     return 2;
   }
 
   ncfile *ncf = nc_loadfile(filename);
   if (!ncf) {
     fprintf(stderr, "Unable to load %s: %s\n", filename, strerror(errno));
     return 1;
   }
 
   // TODO(cbiffle): check OS ABI, ABI version, align mask
+  fprintf(stderr, "mrm DEBUG: Entry: %x\n", ncf->eheader->e_entry);
+  int exit_code = validate(ncf, use_zero_masks, ncf->eheader->e_entry & 1);
 
-  int exit_code = validate(ncf, use_zero_masks);
   nc_freefile(ncf);
   return exit_code;
 }