Index: uspace/lib/c/arch/sparc32/Makefile.common =================================================================== --- uspace/lib/c/arch/sparc32/Makefile.common (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/Makefile.common (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -27,5 +27,4 @@ # -#GCC_CFLAGS += -mcpu=ultrasparc -m64 -mcmodel=medlow LFLAGS = -no-check-sections @@ -34,3 +33,2 @@ BFD_NAME = elf32-sparc BFD_ARCH = sparc - Index: uspace/lib/c/arch/sparc32/include/libarch/atomic.h =================================================================== --- uspace/lib/c/arch/sparc32/include/libarch/atomic.h (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/include/libarch/atomic.h (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -27,5 +27,5 @@ */ -/** @addtogroup libcsparc64 +/** @addtogroup libcsparc32 * @{ */ @@ -33,10 +33,10 @@ */ -#ifndef LIBC_sparc64_ATOMIC_H_ -#define LIBC_sparc64_ATOMIC_H_ +#ifndef LIBC_sparc32_ATOMIC_H_ +#define LIBC_sparc32_ATOMIC_H_ #define LIBC_ARCH_ATOMIC_H_ -#define CAS +#define CAS #include @@ -53,15 +53,13 @@ } -static inline void atomic_inc(atomic_t *val) { - /* On real hardware the increment has to be done - as an atomic action. */ - +static inline void atomic_inc(atomic_t *val) +{ + // FIXME TODO val->count++; } -static inline void atomic_dec(atomic_t *val) { - /* On real hardware the decrement has to be done - as an atomic action. */ - +static inline void atomic_dec(atomic_t *val) +{ + // FIXME TODO val->count++; } @@ -69,7 +67,5 @@ static inline atomic_count_t atomic_postinc(atomic_t *val) { - /* On real hardware both the storing of the previous - value and the increment have to be done as a single - atomic action. */ + // FIXME TODO atomic_count_t prev = val->count; @@ -81,7 +77,5 @@ static inline atomic_count_t atomic_postdec(atomic_t *val) { - /* On real hardware both the storing of the previous - value and the decrement have to be done as a single - atomic action. */ + // FIXME TODO atomic_count_t prev = val->count; @@ -94,68 +88,4 @@ #define atomic_predec(val) (atomic_postdec(val) - 1) -#if 0 -/** Atomic add operation. - * - * Use atomic compare and swap operation to atomically add signed value. - * - * @param val Atomic variable. - * @param i Signed value to be added. - * - * @return Value of the atomic variable as it existed before addition. - * - */ -static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i) -{ - atomic_count_t a; - atomic_count_t b; - - do { - volatile uintptr_t ptr = (uintptr_t) &val->count; - - a = *((atomic_count_t *) ptr); - b = a + i; - -// XXX asm volatile ( -// "cas %0, %2, %1\n" -// : "+m" (*((atomic_count_t *) ptr)), -// "+r" (b) -// : "r" (a) -// ); - } while (a != b); - - return a; -} - -static inline atomic_count_t atomic_preinc(atomic_t *val) -{ - return atomic_add(val, 1) + 1; -} - -static inline atomic_count_t atomic_postinc(atomic_t *val) -{ - return atomic_add(val, 1); -} - -static inline atomic_count_t atomic_predec(atomic_t *val) -{ - return atomic_add(val, -1) - 1; -} - -static inline atomic_count_t atomic_postdec(atomic_t *val) -{ - return atomic_add(val, -1); -} - -static inline void atomic_inc(atomic_t *val) -{ - (void) atomic_add(val, 1); -} - -static inline void atomic_dec(atomic_t *val) -{ - (void) atomic_add(val, -1); -} -#endif - #endif Index: uspace/lib/c/arch/sparc32/include/libarch/config.h =================================================================== --- uspace/lib/c/arch/sparc32/include/libarch/config.h (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/include/libarch/config.h (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -36,6 +36,6 @@ #define LIBC_sparc32_CONFIG_H_ -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) #endif Index: uspace/lib/c/arch/sparc32/include/libarch/ddi.h =================================================================== --- uspace/lib/c/arch/sparc32/include/libarch/ddi.h (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/include/libarch/ddi.h (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2009 Jakub Jermar + * Copyright (c) 2009 Jakub Jermar * All rights reserved. * @@ -28,9 +28,9 @@ /** @file - * @ingroup libsparc64 + * @ingroup libsparc32 */ -#ifndef LIBC_sparc64_DDI_H_ -#define LIBC_sparc64_DDI_H_ +#ifndef LIBC_sparc32_DDI_H_ +#define LIBC_sparc32_DDI_H_ #include @@ -65,9 +65,7 @@ static inline uint8_t arch_pio_read_8(const ioport8_t *port) { - uint8_t rv; - - rv = *port; + uint8_t rv = *port; memory_barrier(); - + return rv; } @@ -75,9 +73,7 @@ static inline uint16_t arch_pio_read_16(const ioport16_t *port) { - uint16_t rv; - - rv = *port; + uint16_t rv = *port; memory_barrier(); - + return rv; } @@ -85,9 +81,7 @@ static inline uint32_t arch_pio_read_32(const ioport32_t *port) { - uint32_t rv; - - rv = *port; + uint32_t rv = *port; memory_barrier(); - + return rv; } Index: uspace/lib/c/arch/sparc32/include/libarch/elf_linux.h =================================================================== --- uspace/lib/c/arch/sparc32/include/libarch/elf_linux.h (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/include/libarch/elf_linux.h (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -27,5 +27,5 @@ */ -/** @addtogroup libcsparc64 +/** @addtogroup libcsparc32 * @{ */ @@ -33,6 +33,6 @@ */ -#ifndef LIBC_sparc64_ELF_LINUX_H_ -#define LBIC_sparc64_ELF_LINUX_H_ +#ifndef LIBC_sparc32_ELF_LINUX_H_ +#define LBIC_sparc32_ELF_LINUX_H_ #include @@ -47,5 +47,6 @@ { /* TODO */ - (void) istate; (void) elf_regs; + (void) istate; + (void) elf_regs; } Index: uspace/lib/c/arch/sparc32/include/libarch/faddr.h =================================================================== --- uspace/lib/c/arch/sparc32/include/libarch/faddr.h (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/include/libarch/faddr.h (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -27,5 +27,5 @@ */ -/** @addtogroup libcsparc64 +/** @addtogroup libcsparc32 * @{ */ @@ -33,10 +33,10 @@ */ -#ifndef LIBC_sparc64_FADDR_H_ -#define LIBC_sparc64_FADDR_H_ +#ifndef LIBC_sparc32_FADDR_H_ +#define LIBC_sparc32_FADDR_H_ #include -#define FADDR(fptr) ((uintptr_t) (fptr)) +#define FADDR(fptr) ((uintptr_t) (fptr)) #endif Index: uspace/lib/c/arch/sparc32/include/libarch/fibril.h =================================================================== --- uspace/lib/c/arch/sparc32/include/libarch/fibril.h (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/include/libarch/fibril.h (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -56,6 +56,6 @@ */ typedef struct { - uintptr_t sp; /* %o6 */ - uintptr_t pc; /* %o7 */ + uintptr_t sp; /* %o6 */ + uintptr_t pc; /* %o7 */ uint32_t i0; uint32_t i1; @@ -64,5 +64,5 @@ uint32_t i4; uint32_t i5; - uintptr_t fp; /* %i6 */ + uintptr_t fp; /* %i6 */ uintptr_t i7; uint32_t l0; @@ -74,5 +74,5 @@ uint32_t l6; uint32_t l7; - uint32_t tp; /* %g7 */ + uint32_t tp; /* %g7 */ } context_t; Index: uspace/lib/c/arch/sparc32/include/libarch/stack.h =================================================================== --- uspace/lib/c/arch/sparc32/include/libarch/stack.h (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/include/libarch/stack.h (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -27,5 +27,5 @@ */ -/** @addtogroup libcsparc64 +/** @addtogroup libcsparc32 * @{ */ @@ -36,18 +36,13 @@ #define LIBC_sparc32_STACK_H_ -#define STACK_ITEM_SIZE 4 +#define STACK_ITEM_SIZE 4 -/** According to SPARC Compliance Definition, every stack frame is 16-byte aligned. */ -#define STACK_ALIGNMENT 8 +#define STACK_ALIGNMENT 8 -/** - * 16-extended-word save area for %i[0-7] and %l[0-7] registers. - */ -#define STACK_WINDOW_SAVE_AREA_SIZE (16 * STACK_ITEM_SIZE) +/** 16-extended-word save area for %i[0-7] and %l[0-7] registers. */ +#define STACK_WINDOW_SAVE_AREA_SIZE (16 * STACK_ITEM_SIZE) -/* - * Six extended words for first six arguments. - */ -#define STACK_ARG_SAVE_AREA_SIZE (6 * STACK_ITEM_SIZE) +/* Six extended words for first six arguments. */ +#define STACK_ARG_SAVE_AREA_SIZE (6 * STACK_ITEM_SIZE) #endif Index: uspace/lib/c/arch/sparc32/include/libarch/syscall.h =================================================================== --- uspace/lib/c/arch/sparc32/include/libarch/syscall.h (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/include/libarch/syscall.h (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -39,15 +39,15 @@ #include -#define __syscall0 __syscall -#define __syscall1 __syscall -#define __syscall2 __syscall -#define __syscall3 __syscall -#define __syscall4 __syscall -#define __syscall5 __syscall -#define __syscall6 __syscall +#define __syscall0 __syscall +#define __syscall1 __syscall +#define __syscall2 __syscall +#define __syscall3 __syscall +#define __syscall4 __syscall +#define __syscall5 __syscall +#define __syscall6 __syscall -static inline sysarg_t -__syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, - const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id) +static inline sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, + const sysarg_t p3, const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, + const syscall_t id) { register uint32_t a1 asm("o0") = p1; @@ -57,9 +57,14 @@ register uint32_t a5 asm("o4") = p5; register uint32_t a6 asm("o5") = p6; - + asm volatile ( "ta %7\n" : "=r" (a1) - : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6), + : "r" (a1), + "r" (a2), + "r" (a3), + "r" (a4), + "r" (a5), + "r" (a6), "i" (id) : "memory" Index: uspace/lib/c/arch/sparc32/include/libarch/tls.h =================================================================== --- uspace/lib/c/arch/sparc32/include/libarch/tls.h (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/include/libarch/tls.h (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -28,14 +28,13 @@ */ -/** @addtogroup libcsparc64 +/** @addtogroup libcsparc32 * @{ */ -/** - * @file - * @brief sparc64 TLS functions. +/** @file + * @brief sparc32 TLS functions. */ -#ifndef LIBC_sparc64_TLS_H_ -#define LIBC_sparc64_TLS_H_ +#ifndef LIBC_sparc32_TLS_H_ +#define LIBC_sparc32_TLS_H_ #define CONFIG_TLS_VARIANT_2 @@ -48,13 +47,20 @@ static inline void __tcb_set(tcb_t *tcb) { - asm volatile ("mov %0, %%g7\n" : : "r" (tcb) : "g7"); + asm volatile( + "mov %0, %%g7\n" + :: "r" (tcb) + : "g7" + ); } -static inline tcb_t * __tcb_get(void) +static inline tcb_t *__tcb_get(void) { void *retval; - - asm volatile ("mov %%g7, %0\n" : "=r" (retval)); - + + asm volatile( + "mov %%g7, %0\n" + : "=r" (retval) + ); + return retval; } Index: uspace/lib/c/arch/sparc32/src/entry.s =================================================================== --- uspace/lib/c/arch/sparc32/src/entry.s (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/src/entry.s (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -42,18 +42,21 @@ # Create the first stack frame. # + save %sp, -176, %sp -# XXX flushw - mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b - save %sp, -64, %sp - + ## XXX flushw mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b - restore - -# XXX end flush -# add %g0, -0x7ff, %fp + 1: + subcc %g1, 1, %g1 + bg 1b + save %sp, -64, %sp + + mov 7, %g1 + 1: + subcc %g1, 1, %g1 + bg 1b + restore + + ## XXX end flush + ## add %g0, -0x7ff, %fp set 0x80000000, %fp Index: uspace/lib/c/arch/sparc32/src/entryjmp.s =================================================================== --- uspace/lib/c/arch/sparc32/src/entryjmp.s (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/src/entryjmp.s (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -40,3 +40,3 @@ call %o0 nop - # fixme: use branch instead of call + # FIXME: use branch instead of call Index: uspace/lib/c/arch/sparc32/src/fibril.S =================================================================== --- uspace/lib/c/arch/sparc32/src/fibril.S (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/src/fibril.S (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -40,17 +40,20 @@ # should a thread switch occur. # - mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b - save %sp, -64, %sp - + mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b - restore - + 1: + subcc %g1, 1, %g1 + bg 1b + save %sp, -64, %sp + + mov 7, %g1 + 1: + subcc %g1, 1, %g1 + bg 1b + restore + CONTEXT_SAVE_ARCH_CORE %o0 retl - mov 1, %o0 ! context_save_arch returns 1 + mov 1, %o0 ! context_save_arch returns 1 context_restore: @@ -61,19 +64,22 @@ # windows mitigates this problem as CWP - 1 becomes the overlap window. # -# XXX -# flushw -# ta 0x4f -# nop - mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b - save %sp, -64, %sp - + + ## XXX + ## flushw + ## ta 0x4f + ## nop mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b - restore + 1: + subcc %g1, 1, %g1 + bg 1b + save %sp, -64, %sp + + mov 7, %g1 + 1: + subcc %g1, 1, %g1 + bg 1b + restore CONTEXT_RESTORE_ARCH_CORE %o0 retl - xor %o0, %o0, %o0 ! context_restore_arch returns 0 + xor %o0, %o0, %o0 ! context_restore_arch returns 0 Index: uspace/lib/c/arch/sparc32/src/stacktrace.c =================================================================== --- uspace/lib/c/arch/sparc32/src/stacktrace.c (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/src/stacktrace.c (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -39,9 +39,8 @@ #include #include - #include -#define FRAME_OFFSET_FP_PREV (14 * 4) -#define FRAME_OFFSET_RA (15 * 4) +#define FRAME_OFFSET_FP_PREV (14 * 4) +#define FRAME_OFFSET_RA (15 * 4) bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) @@ -54,9 +53,9 @@ { uintptr_t bprev; - int rc; - - rc = (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, &bprev); + int rc = (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, + &bprev); if (rc == EOK) *prev = bprev; + return rc; } @@ -64,5 +63,5 @@ int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) { - return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); + return *st->read_uintptr(st->op_arg, fp + FRAME_OFFSET_RA, ra); } Index: uspace/lib/c/arch/sparc32/src/stacktrace_asm.S =================================================================== --- uspace/lib/c/arch/sparc32/src/stacktrace_asm.S (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/src/stacktrace_asm.S (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -37,14 +37,18 @@ stacktrace_prepare: save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp + # Flush all other windows to memory so that we can read their contents. - mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b - save %sp, -64, %sp - + mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b - + 1: + subcc %g1, 1, %g1 + bg 1b + save %sp, -64, %sp + + mov 7, %g1 + 1: + subcc %g1, 1, %g1 + bg 1b + ret restore Index: uspace/lib/c/arch/sparc32/src/thread_entry.s =================================================================== --- uspace/lib/c/arch/sparc32/src/thread_entry.s (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/src/thread_entry.s (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -28,5 +28,5 @@ .text - + .globl __thread_entry @@ -38,24 +38,29 @@ # Create the first stack frame. # + save %sp, -176, %sp -# XXX flushw - mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b - save %sp, -64, %sp - + ## XXX flushw mov 7, %g1 -1: subcc %g1, 1, %g1 - bg 1b -# XXX end flushw + 1: + subcc %g1, 1, %g1 + bg 1b + save %sp, -64, %sp + + mov 7, %g1 + 1: + subcc %g1, 1, %g1 + bg 1b + + ## XXX end flushw set 0x80000000, %fp - + # # Propagate the input arguments to the new window. # + mov %i0, %o0 - + sethi %hi(_gp), %l7 - call __thread_main ! %o0 contains address of uarg + call __thread_main ! %o0 contains address of uarg or %l7, %lo(_gp), %l7 Index: uspace/lib/c/arch/sparc32/src/tls.c =================================================================== --- uspace/lib/c/arch/sparc32/src/tls.c (revision c1023bcbfe6af2cca582653bb8181ff70d9df769) +++ uspace/lib/c/arch/sparc32/src/tls.c (revision 41b735f3b799f5218287fcd1b22dcc821c600aa2) @@ -27,5 +27,5 @@ */ -/** @addtogroup libcsparc64 sparc64 +/** @addtogroup libcsparc32 sparc32 * @ingroup lc * @{