---

yaml
---
r: 51427
b: refs/heads/incoming
c: 087a015
h: refs/heads/master
i:
  51425: d749ba9
  51423: ab5ceb2
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: a692777224150e2dadb5ec02c6ecd5c10ce0dd98
+refs/heads/incoming: 087a015a727b11d46ff5a309ff37c7967e8636d1
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rt/arch/arm/sp.h

@@ -0,0 +1,60 @@
+.text
+
+#if defined(__APPLE__) || defined(_WIN32)
+#define RECORD_SP_LIMIT    _record_sp_limit
+#define GET_SP_LIMIT       _get_sp_limit
+#define GET_SP             _get_sp
+#else
+#define RECORD_SP_LIMIT    record_sp_limit
+#define GET_SP_LIMIT       get_sp_limit
+#define GET_SP             get_sp
+#endif
+
+.globl RECORD_SP_LIMIT
+.globl GET_SP_LIMIT
+.globl GET_SP
+
+#if defined(__linux__) || defined(__FreeBSD__)
+RECORD_SP_LIMIT:
+	movl 4(%esp), %eax
+	movl %eax, %gs:48
+	ret
+#endif
+
+#if defined(__APPLE__)
+RECORD_SP_LIMIT:
+	movl $0x48+90*4, %eax
+	movl 4(%esp), %ecx
+	movl %ecx, %gs:(%eax)
+	ret
+#endif
+
+#if defined(_WIN32)
+RECORD_SP_LIMIT:
+	movl 4(%esp), %eax
+	movl %eax, %fs:0x14
+	ret
+#endif
+
+#if defined(__linux__) || defined(__FreeBSD__)
+GET_SP_LIMIT:
+	movl %gs:48, %eax
+	ret
+#endif
+
+#if defined(__APPLE__)
+GET_SP_LIMIT:
+	movl $0x48+90*4, %ecx
+	movl %gs:(%ecx), %eax
+	ret
+#endif
+
+#if defined(_WIN32)
+GET_SP_LIMIT:
+	movl %fs:0x14, %eax
+	ret
+#endif
+
+GET_SP:
+	movl %esp, %eax
+	ret

branches/incoming/src/rt/arch/i386/record_sp.S

@@ -0,0 +1,52 @@
+.text
+
+#if defined(__APPLE__) || defined(_WIN32)
+#define RECORD_SP_LIMIT    _record_sp_limit
+#define GET_SP_LIMIT       _get_sp_limit
+#define GET_SP             _get_sp
+#else
+#define RECORD_SP_LIMIT    record_sp_limit
+#define GET_SP_LIMIT       get_sp_limit
+#define GET_SP             get_sp
+#endif
+
+.globl RECORD_SP_LIMIT
+.globl GET_SP_LIMIT
+.globl GET_SP
+
+#if defined(__linux__)
+RECORD_SP_LIMIT:
+	movq %rdi, %fs:112
+	ret
+#elif defined(__APPLE__)
+RECORD_SP_LIMIT:
+	movq $0x60+90*8, %rsi
+	movq %rdi, %gs:(%rsi)
+	ret
+#elif defined(__FreeBSD__)
+RECORD_SP_LIMIT:
+	movq %rdi, %fs:24
+	ret
+#else
+RECORD_SP_LIMIT:
+	ret
+#endif
+
+#if defined(__linux__)
+GET_SP_LIMIT:
+	movq %fs:112, %rax
+	ret
+#elif defined(__APPLE__)
+GET_SP_LIMIT:
+	movq $0x60+90*8, %rsi
+	movq %gs:(%rsi), %rax
+	ret
+#elif defined(__FreeBSD__)
+GET_SP_LIMIT:
+	movq %fs:24, %rax
+	ret
+#endif
+
+GET_SP:
+	movq %rsp, %rax
+	ret

branches/incoming/src/rt/arch/i386/sp.h

@@ -11,22 +11,6 @@
 #ifndef RUST_GLOBALS_H
 #define RUST_GLOBALS_H
 
-#if defined(__cplusplus)
-#define INLINE inline
-#elif defined(_MSC_VER) || defined(__GNUC__)
-#define INLINE __inline__
-#else
-#define INLINE inline
-#endif
-
-#if defined(__GNUC__)
-#define ALWAYS_INLINE __attribute((always_inline)) INLINE
-#elif defined(_MSC_VER)
-#define ALWAYS_INLINE __forceinline
-#else
-#define ALWAYS_INLINE INLINE
-#endif
-
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
 #endif

branches/incoming/src/rt/arch/mips/sp.h

@@ -118,7 +118,6 @@
 #include "rust_stack.h"
 #include "rust_type.h"
 #include "rust_sched_loop.h"
-#include "sp.h"
 
 // The amount of extra space at the end of each stack segment, available
 // to the rt, compiler and dynamic linker for running small functions
@@ -420,6 +419,15 @@ template <typename T> struct task_owned {
     }
 };
 
+// This stuff is on the stack-switching fast path
+
+// Records the pointer to the end of the Rust stack in a platform-
+// specific location in the thread control block
+extern "C" CDECL void      record_sp_limit(void *limit);
+extern "C" CDECL uintptr_t get_sp_limit();
+// Gets a pointer to the vicinity of the current stack pointer
+extern "C" uintptr_t       get_sp();
+
 // This is the function that switches between the C and the Rust stack by
 // calling another function with a single void* argument while changing the
 // stack pointer. It has a funny name because gdb doesn't normally like to
@@ -592,6 +600,9 @@ rust_task::prev_stack() {
     record_stack_limit();
 }
 
+extern "C" CDECL void
+record_sp_limit(void *limit);
+
 // The LLVM-generated segmented-stack function prolog compares the amount of
 // stack needed for each frame to the end-of-stack pointer stored in the
 // TCB. As an optimization, when the frame size is less than 256 bytes, it