From 1e2fe4ab8f132e6e84568b050dfaaabdaeae0c43 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 8 Feb 2012 21:18:23 -0800
Subject: [PATCH] rt: Rename call_shim_on_c_stack to call_and_change_stacks

---
 src/rt/arch/i386/context.h   | 2 +-
 src/rt/arch/x86_64/context.h | 2 +-
 src/rt/rust_task.cpp         | 2 +-
 src/rt/rust_upcall.cpp       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/rt/arch/i386/context.h b/src/rt/arch/i386/context.h
index 9d5d0f6d4ee8..71cd7aeada2f 100644
--- a/src/rt/arch/i386/context.h
+++ b/src/rt/arch/i386/context.h
@@ -42,7 +42,7 @@ public:
   void swap(context &out);
   void call(void *f, void *arg, void *sp);
 
-  void call_shim_on_c_stack(void *args, void *fn_ptr) {
+  void call_and_change_stacks(void *args, void *fn_ptr) {
       __morestack(args, fn_ptr, regs.esp);
   }
 };
diff --git a/src/rt/arch/x86_64/context.h b/src/rt/arch/x86_64/context.h
index 651c3e93d02e..2b9b5d4c6c72 100644
--- a/src/rt/arch/x86_64/context.h
+++ b/src/rt/arch/x86_64/context.h
@@ -41,7 +41,7 @@ public:
     void swap(context &out);
     void call(void *f, void *arg, void *sp);
 
-    void call_shim_on_c_stack(void *args, void *fn_ptr) {
+    void call_and_change_stacks(void *args, void *fn_ptr) {
         __morestack(args, fn_ptr, regs.data[RUSTRT_RSP]);
     }
 };
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index 32245c5d9cdb..621eb1e54bc6 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -194,7 +194,7 @@ void task_start_wrapper(spawn_args *a)
 
     // The cleanup work needs lots of stack
     cleanup_args ca = {a, threw_exception};
-    task->thread->c_context.call_shim_on_c_stack(&ca, (void*)cleanup_task);
+    task->thread->c_context.call_and_change_stacks(&ca, (void*)cleanup_task);
 
     task->ctx.next->swap(task->ctx);
 }
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index ea51ecc71c01..c66b43707136 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -48,7 +48,7 @@ call_upcall_on_c_stack(void *args, void *fn_ptr) {
     check_stack_alignment();
     rust_task *task = rust_task_thread::get_task();
     rust_task_thread *thread = task->thread;
-    thread->c_context.call_shim_on_c_stack(args, fn_ptr);
+    thread->c_context.call_and_change_stacks(args, fn_ptr);
 }
 
 extern "C" void record_sp(void *limit);
@@ -71,7 +71,7 @@ upcall_call_shim_on_c_stack(void *args, void *fn_ptr) {
 
     rust_task_thread *thread = task->thread;
     try {
-        thread->c_context.call_shim_on_c_stack(args, fn_ptr);
+        thread->c_context.call_and_change_stacks(args, fn_ptr);
     } catch (...) {
         A(thread, false, "Native code threw an exception");
     }