Merge 7712 - Ensure super instructions are marked during dynamic code modification.

tests/dynamic_code_loading/dynamic_modify_test.c

 /*
- * Copyright (c) 2011 The Native Client Authors. All rights reserved.
+ * Copyright (c) 2012 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 <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 291 matching lines @@
     first_diff++;
   }
   rc = nacl_dyncode_modify(load_area+first_diff, buf+first_diff,
                            sizeof(buf)-first_diff);
   assert(rc != 0);
   func = (int (*)()) (uintptr_t) load_area;
   rc = func();
   assert(rc == 1234);
 }
 
+#if defined(__i386__) || defined(__x86_64__)
+void test_jump_into_super_inst_create() {
+  uint8_t *load_area = allocate_code_space(1);
+  uint8_t buf[BUF_SIZE];
+  int rc;
+
+  /* A direct jump into a bundle is invalid. */
+  copy_and_pad_fragment(buf, sizeof(buf), &jump_into_super_inst_modified,
+                        &jump_into_super_inst_modified_end);
+  rc = nacl_dyncode_create(load_area, buf, sizeof(buf));
+  assert(rc != 0);
+  assert(errno == EINVAL);
+}
+
+void test_start_with_super_inst_replace() {
+  uint8_t *load_area = allocate_code_space(1);
+  uint8_t buf[BUF_SIZE];
+  int rc;
+
+  /* The original version is fine. */
+  copy_and_pad_fragment(buf, sizeof(buf), &jump_into_super_inst_original,
+                        &jump_into_super_inst_original_end);
+  rc = nacl_dyncode_create(load_area, buf, sizeof(buf));
+  assert(rc == 0);
+
+  /* Replace the code with itself.  This makes sure that replacement code can
+   * start with a super instruction.
+   */
+  copy_and_pad_fragment(buf, sizeof(buf), &jump_into_super_inst_original,
+                        &jump_into_super_inst_original_end);
+  rc = nacl_dyncode_modify(load_area, buf, sizeof(buf));
+  assert(rc == 0);
+}
+
+void test_jump_into_super_inst_replace() {
+  uint8_t *load_area = allocate_code_space(1);
+  uint8_t buf[BUF_SIZE];
+  int rc;
+
+  /* The original version is fine. */
+  copy_and_pad_fragment(buf, sizeof(buf), &jump_into_super_inst_original,
+                        &jump_into_super_inst_original_end);
+  rc = nacl_dyncode_create(load_area, buf, sizeof(buf));
+  assert(rc == 0);
+
+  /* The modified version cannot be used as a replacement.
+   * See: http://code.google.com/p/nativeclient/issues/detail?id=2563
+   */
+  copy_and_pad_fragment(buf, sizeof(buf), &jump_into_super_inst_modified,
+                        &jump_into_super_inst_modified_end);
+  rc = nacl_dyncode_modify(load_area, buf, sizeof(buf));
+  assert(rc != 0);
+  assert(errno == EINVAL);
+}
+#endif
 
 void run_test(const char *test_name, void (*test_func)(void)) {
   printf("Running %s...\n", test_name);
   test_func();
 }
 
 int is_replacement_enabled() {
   char trash;
   return (0 == nacl_dyncode_modify(allocate_code_space(1), &trash, 0));
 }
 
 #define RUN_TEST(test_func) (run_test(#test_func, test_func))
 
 int TestMain() {
   /* Turn off stdout buffering to aid debugging in case of a crash. */
   setvbuf(stdout, NULL, _IONBF, 0);
 
   assert(is_replacement_enabled());
 
   RUN_TEST(test_replacing_code);
   RUN_TEST(test_replacing_code_unaligned);
 #if defined(__i386__) || defined(__x86_64__)
   RUN_TEST(test_replacing_code_slowpaths);
+  RUN_TEST(test_jump_into_super_inst_create);
+  RUN_TEST(test_start_with_super_inst_replace);
+  RUN_TEST(test_jump_into_super_inst_replace);
 #endif
   RUN_TEST(test_illegal_code_replacment);
   RUN_TEST(test_external_jump_target_replacement);
 
   return 0;
 }
 
 int main() {
   return RunTests(TestMain);
 }