X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-linux-os.c;h=1028b837d2b579a8efcc10c66c17c3a49d062410;hb=a41c057bfe9d8b0b53d2765b8559f18327f28813;hp=2f4a0dad4b9e635f7c0c486f25aedefa64071b69;hpb=c65f4c06c83c9dbf213cece638ad3d59710841bb;p=sbcl.git diff --git a/src/runtime/mips-linux-os.c b/src/runtime/mips-linux-os.c index 2f4a0da..1028b83 100644 --- a/src/runtime/mips-linux-os.c +++ b/src/runtime/mips-linux-os.c @@ -15,65 +15,54 @@ */ #include -#include -#include -#include "./signal.h" -#include "os.h" -#include "arch.h" -#include "globals.h" -#include "interrupt.h" -#include "interr.h" -#include "lispregs.h" -#include "sbcl.h" -#include -#include - -#include #include -#include -#include -#include -#include "validate.h" /* for cacheflush() */ -#include +#include + +#include "sbcl.h" +#include "os.h" +#include "arch.h" + +#define CAUSEF_BD (1 << 31) -/* FIXME: For CAUSEF_BD */ -#include size_t os_vm_page_size; +int +arch_os_thread_init(struct thread *thread) +{ #ifdef LISP_FEATURE_SB_THREAD -#error "Define threading support functions" -#else -int arch_os_thread_init(struct thread *thread) { +#warning "Check threading support functions" +#endif return 1; /* success */ } -int arch_os_thread_cleanup(struct thread *thread) { + +int +arch_os_thread_cleanup(struct thread *thread) +{ +#ifdef LISP_FEATURE_SB_THREAD +#warning "Check threading support functions" +#endif return 1; /* success */ } -#endif os_context_register_t * os_context_register_addr(os_context_t *context, int offset) { - if (offset == 0) { - /* KLUDGE: I'm not sure, but it's possible that Linux puts the - contents of the Processor Status Word in the (wired-zero) - slot in the mcontext. In any case, the following is - unlikely to do any harm: */ - static unsigned long long zero; - zero = 0; - return &zero; - } else { - return &(((struct sigcontext *) &(context->uc_mcontext))->sc_regs[offset]); - } + return &(((struct sigcontext *)&(context->uc_mcontext))->sc_regs[offset]); +} + +os_context_register_t * +os_context_fpregister_addr(os_context_t *context, int offset) +{ + return &(((struct sigcontext *)&(context->uc_mcontext))->sc_fpregs[offset]); } os_context_register_t * os_context_pc_addr(os_context_t *context) { /* Why do I get all the silly ports? -- CSR, 2002-08-11 */ - return &(((struct sigcontext *) &(context->uc_mcontext))->sc_pc); + return &(((struct sigcontext *)&(context->uc_mcontext))->sc_pc); } sigset_t * @@ -82,7 +71,14 @@ os_context_sigmask_addr(os_context_t *context) return &(context->uc_sigmask); } -void +unsigned int +os_context_fp_control(os_context_t *context) +{ + /* FIXME: Probably do something. */ + return 0; +} + +void os_restore_fp_control(os_context_t *context) { /* FIXME: Probably do something. */ @@ -99,16 +95,29 @@ os_context_bd_cause(os_context_t *context) loop" where a (BREAK 16) not in a branch delay slot would have CAUSEF_BD filled. So, we comment - return (((struct sigcontext *) &(context->uc_mcontext))->sc_cause - & CAUSEF_BD); + return (((struct sigcontext *) &(context->uc_mcontext))->sc_cause + & CAUSEF_BD); out and return 0 always. -- CSR, 2002-09-02 */ + /* Unfortunately, returning 0 fails for taken branches because + os_context_bd_cause is also used to find out if a branch + emulation is needed. We work around that by checking if the + current instruction is a jump or a branch. */ + extern boolean arch_insn_with_bdelay_p(unsigned int insn); + + os_vm_address_t addr + = (os_vm_address_t)(unsigned int)*os_context_pc_addr(context); + unsigned int insn = *(unsigned int *)addr; + + if (arch_insn_with_bdelay_p(insn)) + return CAUSEF_BD; + return 0; } -void +void os_flush_icache(os_vm_address_t address, os_vm_size_t length) { if (cacheflush(address, length, ICACHE) == -1) - perror("cacheflush"); + perror("cacheflush"); }