reverted last commit (sorry, committed wrong file.. :)

cpu/x86/mtarch.c

@@ -1,66 +1,9 @@
-/*
- * Copyright (c) 2005, Swedish Institute of Computer Science
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file is part of the Contiki operating system.
- *
- * @(#)$Id: mtarch.c,v 1.3 2009/03/13 14:40:07 fros4943 Exp $
- */
 
-#include <stddef.h>
-
-#include <limits.h>
 #include <stdio.h>
-#include <string.h>
+#include "sys/mt.h"
-#include "sys/cooja_mt.h"
-
-#ifndef __WORDSIZE
-#define __WORDSIZE 32
-#endif /* __WORDSIZE */
-
-#ifndef ON_64BIT_ARCH
-#if __WORDSIZE == 64
-#define ON_64BIT_ARCH 1
-#else /* ON_64BIT_ARCH */
-#define ON_64BIT_ARCH 0
-#endif /* __WORDSIZE == 64 */
-#endif /* ON_64BIT_ARCH */
 
 struct frame {
   unsigned long flags;
-#if ON_64BIT_ARCH
-  unsigned long rbp;
-  unsigned long rdi;
-  unsigned long rsi;
-  unsigned long rdx;
-  unsigned long rcx;
-  unsigned long rbx;
-  unsigned long rax;
-#else /* ON_64BIT_ARCH */
   unsigned long ebp;
   unsigned long edi;
   unsigned long esi;
@@ -68,25 +11,27 @@ struct frame {
   unsigned long ecx;
   unsigned long ebx;
   unsigned long eax;
-#endif /* ON_64BIT_ARCH */
   unsigned long retaddr;
   unsigned long retaddr2;
   unsigned long data;
 };
+
 /*--------------------------------------------------------------------------*/
 void
-cooja_mtarch_init(void)
+mtarch_init(void)
 {
+
 }
 /*--------------------------------------------------------------------------*/
 void
-cooja_mtarch_start(struct cooja_mtarch_thread *t,
+mtarch_start(struct mtarch_thread *t,
-    void (*function)(void *), void *data)
+         void (*function)(void *), void *data)
 {
-  struct frame *f = (struct frame *)&t->stack[COOJA_MTARCH_STACKSIZE - sizeof(struct frame)/sizeof(unsigned long)];
+
+  struct frame *f = (struct frame *)&t->stack[MTARCH_STACKSIZE - sizeof(struct frame)/4];
   int i;
 
-  for(i = 0; i < COOJA_MTARCH_STACKSIZE; ++i) {
+  for(i = 0; i < MTARCH_STACKSIZE; ++i) {
     t->stack[i] = i;
   }
 
@@ -94,129 +39,81 @@ cooja_mtarch_start(struct cooja_mtarch_thread *t,
   f->retaddr = (unsigned long)function;
   f->data    = (unsigned long)data;
   t->sp      = (unsigned long)&f->flags;
-#if ON_64BIT_ARCH
-  f->rbp     = (unsigned long)&f->rax;
-#else /* ON_64BIT_ARCH */
   f->ebp     = (unsigned long)&f->eax;
-#endif /* ON_64BIT_ARCH */
 }
 /*--------------------------------------------------------------------------*/
-static struct cooja_mtarch_thread *cooja_running_thread;
+static unsigned long spsave, sptmp;
-/*--------------------------------------------------------------------------*/
+static struct mtarch_thread *running_thread;
-void cooja_sw(void)
+
+static void
+sw(void)
 {
-  /* Store registers */
-#if ON_64BIT_ARCH
-  __asm__ (
-      "pushq %rax\n\t"
-      "pushq %rbx\n\t"
-      "pushq %rcx\n\t"
-      "pushq %rdx\n\t"
-      "pushq %rsi\n\t"
-      "pushq %rdi\n\t"
-      "pushq %rbp\n\t"
-      "pushq %rbp\n\t");
-#else /* ON_64BIT_ARCH */
-  __asm__ (
-      "pushl %eax\n\t"
-      "pushl %ebx\n\t"
-      "pushl %ecx\n\t"
-      "pushl %edx\n\t"
-      "pushl %esi\n\t"
-      "pushl %edi\n\t"
-      "pushl %ebp\n\t"
-      "pushl %ebp\n\t");
-#endif /* ON_64BIT_ARCH */
 
-  /* Switch stack pointer */
+  asm("pushl %eax");
-#if ON_64BIT_ARCH
+  asm("pushl %ebx");
-  __asm__ ("movq %0, %%rax\n\t" : : "m" (cooja_running_thread));
+  asm("pushl %ecx");
-  __asm__ (
+  asm("pushl %edx");
-      "movq (%rax), %rbx\n\t"
+  asm("pushl %esi");
-      "movq %rsp, (%rax)\n\t"
+  asm("pushl %edi");
-      "movq %rbx, %rsp\n\t"
+  asm("pushl %ebp");
-  );
+  asm("pushl %ebp"); /* XXX: should push FPU flags here. */
-#else /* ON_64BIT_ARCH */
+  asm("movl %esp, spsave");
-  __asm__ ("movl %0, %%eax\n\t" : : "m" (cooja_running_thread));
-  __asm__ (
-      "movl (%eax), %ebx\n\t"
-      "movl %esp, (%eax)\n\t"
-      "movl %ebx, %esp\n\t"
-  );
-#endif /* ON_64BIT_ARCH */
 
-  /* Restore previous registers */
+  sptmp = running_thread->sp;
-#if ON_64BIT_ARCH
+  running_thread->sp = spsave;
-  __asm__ (
-      "popq %rbp\n\t"
-      "popq %rbp\n\t"
-      "popq %rdi\n\t"
-      "popq %rsi\n\t"
-      "popq %rdx\n\t"
-      "popq %rcx\n\t"
-      "popq %rbx\n\t"
-      "popq %rax\n\t"
-
-      "leave\n\t"
-      "ret\n\t"
-  );
-#else /* ON_64BIT_ARCH */
-  __asm__ (
-      "popl %ebp\n\t"
-      "popl %ebp\n\t"
-      "popl %edi\n\t"
-      "popl %esi\n\t"
-      "popl %edx\n\t"
-      "popl %ecx\n\t"
-      "popl %ebx\n\t"
-      "popl %eax\n\t"
-
-      "leave\n\t"
-      "ret\n\t"
-  );
-#endif /* ON_64BIT_ARCH */
 
+  asm("movl sptmp, %esp");
+  asm("popl %ebp"); /* XXX: should pop FPU flags here. */
+  asm("popl %ebp");
+  asm("popl %edi");
+  asm("popl %esi");
+  asm("popl %edx");
+  asm("popl %ecx");
+  asm("popl %ebx");
+  asm("popl %eax");
 }
 
 /*--------------------------------------------------------------------------*/
 void
-cooja_mtarch_exec(struct cooja_mtarch_thread *t)
+mtarch_exec(struct mtarch_thread *t)
 {
-  cooja_running_thread = t;
+  running_thread = t;
-  cooja_sw();
+  sw();
-  cooja_running_thread = NULL;
+  running_thread = NULL;
 }
 /*--------------------------------------------------------------------------*/
 void
-cooja_mtarch_remove(void)
+mtarch_remove(void)
 {
+
 }
 /*--------------------------------------------------------------------------*/
 void
-cooja_mtarch_yield(void)
+mtarch_yield(void)
 {
-  cooja_sw();
+  sw();
 }
 /*--------------------------------------------------------------------------*/
 void
-cooja_mtarch_pstop(void)
+mtarch_pstop(void)
 {
+
 }
 /*--------------------------------------------------------------------------*/
 void
-cooja_mtarch_pstart(void)
+mtarch_pstart(void)
 {
+
 }
 /*--------------------------------------------------------------------------*/
 int
-cooja_mtarch_stack_usage(struct cooja_mt_thread *t)
+mtarch_stack_usage(struct mt_thread *t)
 {
   int i;
-  for(i = 0; i < COOJA_MTARCH_STACKSIZE; ++i) {
+  for(i = 0; i < MTARCH_STACKSIZE; ++i) {
     if(t->thread.stack[i] != i) {
-      return COOJA_MTARCH_STACKSIZE - i;
+      return MTARCH_STACKSIZE - i;
     }
   }
-  return -1;
 }
 /*--------------------------------------------------------------------------*/