typedef char * raw_stack_t;
+typedef void (*rawctx_entry_point_t)(void *);
typedef struct s_smx_ctx_raw {
s_smx_ctx_base_t super; /* Fields of super implementation */
smx_ctx_raw_t maestro_context;
-static inline __attribute__((regparm(2))) void raw_swapcontext(raw_stack_t*old, raw_stack_t*new) {
- __asm__ __volatile__ (
- "ret"
- );
+extern raw_stack_t raw_makecontext(char* malloced_stack, int stack_size,
+ rawctx_entry_point_t entry_point, void* arg);
+extern void raw_swapcontext(raw_stack_t* old, raw_stack_t new);
+
+#ifdef PROCESSOR_i686
+__asm__ (
+ ".text\n"
+ ".globl raw_makecontext\n"
+ ".type raw_makecontext,@function\n"
+ "raw_makecontext:\n"
+ " movl 4(%esp),%eax\n" /* stack */
+ " addl 8(%esp),%eax\n" /* size */
+ " movl 12(%esp),%ecx\n" /* func */
+ " movl 16(%esp),%edx\n" /* arg */
+ " movl %edx, -4(%eax)\n"
+ " movl $0, -8(%eax)\n" /* @return for func */
+ " movl %ecx,-12(%eax)\n"
+ " movl $0, -16(%eax)\n" /* ebp */
+ " movl $0, -20(%eax)\n" /* ebx */
+ " movl $0, -24(%eax)\n" /* esi */
+ " movl $0, -28(%eax)\n" /* edi */
+ " subl $28,%eax\n"
+ " retl\n"
+);
+
+__asm__ (
+ ".text\n"
+ ".globl raw_swapcontext\n"
+ ".type raw_swapcontext,@function\n"
+ "raw_swapcontext:\n"
+ " movl 4(%esp),%eax\n" /* old */
+ " movl 8(%esp),%edx\n" /* new */
+ " pushl %ebp\n"
+ " pushl %ebx\n"
+ " pushl %esi\n"
+ " pushl %edi\n"
+ " movl %esp,(%eax)\n"
+ " movl %edx,%esp\n"
+ " popl %edi\n"
+ " popl %esi\n"
+ " popl %ebx\n"
+ " popl %ebp\n"
+ " retl\n"
+);
+#elif PROCESSOR_x86_64
+__asm__ (
+ ".text\n"
+ ".globl raw_makecontext\n"
+ ".type raw_makecontext,@function\n"
+ "raw_makecontext:\n" /* Calling convention sets the arguments in rdi, rsi, rdx and rcx, respectively */
+ " movq %rdi,%rax\n" /* stack */
+ " addq %rsi,%rax\n" /* size */
+ " movq $0, -8(%rax)\n" /* @return for func */
+ " movq %rdx,-16(%rax)\n" /* func */
+ " movq %rcx,-24(%rax)\n" /* arg/rdi */
+ " movq $0, -32(%rax)\n" /* rsi */
+ " movq $0, -40(%rax)\n" /* rdx */
+ " movq $0, -48(%rax)\n" /* rcx */
+ " movq $0, -56(%rax)\n" /* r8 */
+ " movq $0, -64(%rax)\n" /* r9 */
+ " movq $0, -72(%rax)\n" /* rbp */
+ " movq $0, -80(%rax)\n" /* rbx */
+ " movq $0, -88(%rax)\n" /* r12 */
+ " movq $0, -96(%rax)\n" /* r13 */
+ " movq $0, -104(%rax)\n" /* r14 */
+ " movq $0, -112(%rax)\n" /* r15 */
+ " subq $112,%rax\n"
+ " retq\n"
+);
+
+__asm__ (
+ ".text\n"
+ ".globl raw_swapcontext\n"
+ ".type raw_swapcontext,@function\n"
+ "raw_swapcontext:\n" /* Calling convention sets the arguments in rdi and rsi, respectively */
+ " pushq %rdi\n"
+ " pushq %rsi\n"
+ " pushq %rdx\n"
+ " pushq %rcx\n"
+ " pushq %r8\n"
+ " pushq %r9\n"
+ " pushq %rbp\n"
+ " pushq %rbx\n"
+ " pushq %r12\n"
+ " pushq %r13\n"
+ " pushq %r14\n"
+ " pushq %r15\n"
+ " movq %rsp,(%rdi)\n" /* old */
+ " movq %rsi,%rsp\n" /* new */
+ " popq %r15\n"
+ " popq %r14\n"
+ " popq %r13\n"
+ " popq %r12\n"
+ " popq %rbx\n"
+ " popq %rbp\n"
+ " popq %r9\n"
+ " popq %r8\n"
+ " popq %rcx\n"
+ " popq %rdx\n"
+ " popq %rsi\n"
+ " popq %rdi\n"
+ " retq\n"
+);
+#else
+raw_stack_t raw_makecontext(char* malloced_stack, int stack_size,
+ rawctx_entry_point_t entry_point, void* arg) {
+ THROW_UNIMPLEMENTED;
}
-typedef void (*rawctx_entry_point_t)(void *);
-static inline raw_stack_t raw_makecontext(char*malloced_stack, int stack_size,
- rawctx_entry_point_t entry_point, void *arg) {
- __asm__ __volatile__ (
- "popl %ebx"
- );
- return NULL;
+
+void raw_swapcontext(raw_stack_t* old, raw_stack_t new) {
+ THROW_UNIMPLEMENTED;
}
+
+#endif
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
static xbt_tpool_t tpool;
static void smx_ctx_raw_suspend(smx_context_t context)
{
smx_current_context = (smx_context_t)maestro_context;
- raw_swapcontext(&((smx_ctx_raw_t) context)->stack_top, &maestro_context->stack_top);
+ raw_swapcontext(&((smx_ctx_raw_t) context)->stack_top, maestro_context->stack_top);
}
static void smx_ctx_raw_stop(smx_context_t context)
static void smx_ctx_raw_resume(smx_context_t context)
{
smx_current_context = context;
- raw_swapcontext(&maestro_context->stack_top, &((smx_ctx_raw_t) context)->stack_top);
+ raw_swapcontext(&maestro_context->stack_top, ((smx_ctx_raw_t) context)->stack_top);
}
static void smx_ctx_raw_runall(xbt_swag_t processes)
static void smx_ctx_raw_resume_parallel(smx_context_t context)
{
xbt_os_thread_set_extra_data(context);
- raw_swapcontext(&maestro_context->stack_top, &((smx_ctx_raw_t) context)->stack_top);
+ raw_swapcontext(&maestro_context->stack_top, ((smx_ctx_raw_t) context)->stack_top);
}
static void smx_ctx_raw_runall_parallel(xbt_swag_t processes)
void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
{
+ INFO0("Using raw contexts. Because the glibc is just not good enough for us.");
smx_ctx_base_factory_init(factory);
(*factory)->finalize = smx_ctx_raw_factory_finalize;
