Reviewers: danno,

Description:
Merged r10556 into 3.6 branch.

MIPS: Add signal context definitions for use with Android. (2nd try)

[email protected]


Please review this at https://chromiumcodereview.appspot.com/9303029/

SVN Base: https://v8.googlecode.com/svn/branches/3.6

Affected files:
  M src/platform-linux.cc
  M src/version.cc


Index: src/platform-linux.cc
diff --git a/src/platform-linux.cc b/src/platform-linux.cc
index b152dae9a61ec7ecbf4dd7762cbd6c236ba82c58..c044739e8035500354db9042ad1b9afa7312442d 100644
--- a/src/platform-linux.cc
+++ b/src/platform-linux.cc
@@ -878,6 +878,38 @@ typedef struct ucontext {
 } ucontext_t;
 enum ArmRegisters {R15 = 15, R13 = 13, R11 = 11};

+#elif !defined(__GLIBC__) && defined(__mips__)
+// MIPS version of sigcontext, for Android bionic.
+struct sigcontext {
+  uint32_t regmask;
+  uint32_t status;
+  uint64_t pc;
+  uint64_t gregs[32];
+  uint64_t fpregs[32];
+  uint32_t acx;
+  uint32_t fpc_csr;
+  uint32_t fpc_eir;
+  uint32_t used_math;
+  uint32_t dsp;
+  uint64_t mdhi;
+  uint64_t mdlo;
+  uint32_t hi1;
+  uint32_t lo1;
+  uint32_t hi2;
+  uint32_t lo2;
+  uint32_t hi3;
+  uint32_t lo3;
+};
+typedef uint32_t __sigset_t;
+typedef struct sigcontext mcontext_t;
+typedef struct ucontext {
+  uint32_t uc_flags;
+  struct ucontext* uc_link;
+  stack_t uc_stack;
+  mcontext_t uc_mcontext;
+  __sigset_t uc_sigmask;
+} ucontext_t;
+
 #endif


Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 4d0e24535464a04305440f0eb1854d0361e9b321..dd36faa7c5767c70b78ab188b441520fa7dc1b5a 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     6
 #define BUILD_NUMBER      6
-#define PATCH_LEVEL       20
+#define PATCH_LEVEL       21
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to