[haiku-commits] r33618 - haiku/trunk/src/system/kernel/arch/arm
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 17 Oct 2009 17:26:58 +0200 (CEST)
Author: mmu_man
Date: 2009-10-17 17:26:58 +0200 (Sat, 17 Oct 2009)
New Revision: 33618
Changeset: http://dev.haiku-os.org/changeset/33618/haiku
Added:
haiku/trunk/src/system/kernel/arch/arm/arch_smp.cpp
haiku/trunk/src/system/kernel/arch/arm/arch_thread.cpp
Removed:
haiku/trunk/src/system/kernel/arch/arm/arch_smp.c
haiku/trunk/src/system/kernel/arch/arm/arch_thread.c
Modified:
haiku/trunk/src/system/kernel/arch/arm/Jamfile
Log:
Fix ARM build, thx Axel :P
Modified: haiku/trunk/src/system/kernel/arch/arm/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/arch/arm/Jamfile 2009-10-17 14:59:26 UTC
(rev 33617)
+++ haiku/trunk/src/system/kernel/arch/arm/Jamfile 2009-10-17 15:26:58 UTC
(rev 33618)
@@ -20,9 +20,9 @@
arch_int.cpp
arch_platform.cpp
arch_real_time_clock.cpp
- arch_smp.c
+ arch_smp.cpp
arch_system_info.cpp
- arch_thread.c
+ arch_thread.cpp
arch_timer.cpp
arch_user_debugger.cpp
arch_vm.cpp
Copied: haiku/trunk/src/system/kernel/arch/arm/arch_smp.cpp (from rev 33615,
haiku/trunk/src/system/kernel/arch/arm/arch_smp.c)
===================================================================
--- haiku/trunk/src/system/kernel/arch/arm/arch_smp.cpp
(rev 0)
+++ haiku/trunk/src/system/kernel/arch/arm/arch_smp.cpp 2009-10-17 15:26:58 UTC
(rev 33618)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2007, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * François Revol <revol@xxxxxxx>
+ *
+ * Copyright 2004, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx
+ * Distributed under the terms of the OpenBeOS License.
+ */
+
+
+#include <KernelExport.h>
+
+#include <boot/stage2.h>
+#include <arch/smp.h>
+#include <debug.h>
+
+
+status_t
+arch_smp_init(kernel_args *args)
+{
+ return B_OK;
+}
+
+
+status_t
+arch_smp_per_cpu_init(kernel_args *args, int32 cpu)
+{
+ return B_OK;
+}
+
+
+void
+arch_smp_send_ici(int32 target_cpu)
+{
+ panic("called arch_smp_send_ici!\n");
+}
+
+
+void
+arch_smp_send_broadcast_ici()
+{
+ panic("called arch_smp_send_broadcast_ici\n");
+}
+
Property changes on: haiku/trunk/src/system/kernel/arch/arm/arch_smp.cpp
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: haiku/trunk/src/system/kernel/arch/arm/arch_thread.cpp (from rev 33615,
haiku/trunk/src/system/kernel/arch/arm/arch_thread.c)
===================================================================
--- haiku/trunk/src/system/kernel/arch/arm/arch_thread.cpp
(rev 0)
+++ haiku/trunk/src/system/kernel/arch/arm/arch_thread.cpp 2009-10-17
15:26:58 UTC (rev 33618)
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2003-2007, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
+ * Ingo Weinhold <bonefish@xxxxxxxxxxxxxxx>
+ * François Revol <revol@xxxxxxx>
+ *
+ * Copyright 2001, Travis Geiselbrecht. All rights reserved.
+ * Distributed under the terms of the NewOS License.
+ */
+
+#include <arch_thread.h>
+
+#include <arch_cpu.h>
+#include <arch/thread.h>
+#include <boot/stage2.h>
+#include <kernel.h>
+#include <thread.h>
+#include <vm_address_space.h>
+#include <vm_types.h>
+#include <arch_vm.h>
+//#include <arch/vm_translation_map.h>
+
+#include <string.h>
+
+#warning M68K: writeme!
+// Valid initial arch_thread state. We just memcpy() it when initializing
+// a new thread structure.
+static struct arch_thread sInitialState;
+
+struct thread *gCurrentThread;
+
+
+status_t
+arch_thread_init(struct kernel_args *args)
+{
+ // Initialize the static initial arch_thread state (sInitialState).
+ // Currently nothing to do, i.e. zero initialized is just fine.
+
+ return B_OK;
+}
+
+
+status_t
+arch_team_init_team_struct(struct team *team, bool kernel)
+{
+ // Nothing to do. The structure is empty.
+ return B_OK;
+}
+
+
+status_t
+arch_thread_init_thread_struct(struct thread *thread)
+{
+ // set up an initial state (stack & fpu)
+ memcpy(&thread->arch_info, &sInitialState, sizeof(struct arch_thread));
+
+ return B_OK;
+}
+
+
+status_t
+arch_thread_init_kthread_stack(struct thread *t, int (*start_func)(void),
+ void (*entry_func)(void), void (*exit_func)(void))
+{
+/* addr_t *kstack = (addr_t *)t->kernel_stack_base;
+ addr_t *kstackTop = (addr_t *)t->kernel_stack_base;
+
+ // clear the kernel stack
+#ifdef DEBUG_KERNEL_STACKS
+# ifdef STACK_GROWS_DOWNWARDS
+ memset((void *)((addr_t)kstack + KERNEL_STACK_GUARD_PAGES *
B_PAGE_SIZE), 0,
+ KERNEL_STACK_SIZE);
+# else
+ memset(kstack, 0, KERNEL_STACK_SIZE);
+# endif
+#else
+ memset(kstack, 0, KERNEL_STACK_SIZE);
+#endif
+
+ // space for frame pointer and return address, and stack frames must be
+ // 16 byte aligned
+ kstackTop -= 2;
+ kstackTop = (addr_t*)((addr_t)kstackTop & ~0xf);
+
+ // LR, CR, r2, r13-r31, f13-f31, as pushed by m68k_context_switch()
+ kstackTop -= 22 + 2 * 19;
+
+ // let LR point to m68k_kernel_thread_root()
+ kstackTop[0] = (addr_t)&m68k_kernel_thread_root;
+
+ // the arguments of m68k_kernel_thread_root() are the functions to call,
+ // provided in registers r13-r15
+ kstackTop[3] = (addr_t)entry_func;
+ kstackTop[4] = (addr_t)start_func;
+ kstackTop[5] = (addr_t)exit_func;
+
+ // save this stack position
+ t->arch_info.sp = (void *)kstackTop;
+*/
+#warning ARM:WRITEME
+ return B_OK;
+}
+
+
+status_t
+arch_thread_init_tls(struct thread *thread)
+{
+ // TODO: Implement!
+ return B_OK;
+}
+
+
+void
+arch_thread_switch_kstack_and_call(struct thread *t, addr_t newKstack,
+ void (*func)(void *), void *arg)
+{
+#warning ARM:WRITEME
+// m68k_switch_stack_and_call(newKstack, func, arg);
+}
+
+
+void
+arch_thread_context_switch(struct thread *from, struct thread *to)
+{
+/* addr_t newPageDirectory;
+
+ newPageDirectory = (addr_t)m68k_next_page_directory(from, to);
+
+ if ((newPageDirectory % B_PAGE_SIZE) != 0)
+ panic("arch_thread_context_switch: bad pgdir 0x%lx\n",
newPageDirectory);
+#warning M68K: export from arch_vm.c
+ m68k_set_pgdir(newPageDirectory);
+ m68k_context_switch(&from->arch_info.sp, to->arch_info.sp);*/
+#warning ARM:WRITEME
+
+}
+
+
+void
+arch_thread_dump_info(void *info)
+{
+ struct arch_thread *at = (struct arch_thread *)info;
+
+ dprintf("\tsp: %p\n", at->sp);
+}
+
+
+status_t
+arch_thread_enter_userspace(struct thread *thread, addr_t entry, void *arg1,
void *arg2)
+{
+ panic("arch_thread_enter_uspace(): not yet implemented\n");
+ return B_ERROR;
+}
+
+
+bool
+arch_on_signal_stack(struct thread *thread)
+{
+ return false;
+}
+
+
+status_t
+arch_setup_signal_frame(struct thread *thread, struct sigaction *sa, int sig,
int sigMask)
+{
+ return B_ERROR;
+}
+
+
+int64
+arch_restore_signal_frame(void)
+{
+ return 0;
+}
+
+
+void
+arch_check_syscall_restart(struct thread *thread)
+{
+}
+
+
+/** Saves everything needed to restore the frame in the child fork in the
+ * arch_fork_arg structure to be passed to arch_restore_fork_frame().
+ * Also makes sure to return the right value.
+ */
+
+void
+arch_store_fork_frame(struct arch_fork_arg *arg)
+{
+}
+
+
+/** Restores the frame from a forked team as specified by the provided
+ * arch_fork_arg structure.
+ * Needs to be called from within the child team, ie. instead of
+ * arch_thread_enter_uspace() as thread "starter".
+ * This function does not return to the caller, but will enter userland
+ * in the child team at the same position where the parent team left of.
+ */
+
+void
+arch_restore_fork_frame(struct arch_fork_arg *arg)
+{
+}
+
Property changes on: haiku/trunk/src/system/kernel/arch/arm/arch_thread.cpp
___________________________________________________________________
Added: svn:mergeinfo
+
Other related posts:
- » [haiku-commits] r33618 - haiku/trunk/src/system/kernel/arch/arm - revol
