| /branches/dd/uspace/lib/libc/arch/amd64/_link.ld.in |
|---|
| 1,4 → 1,4 |
| STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o) |
| STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o) |
| ENTRY(__entry) |
| PHDRS { |
| /branches/dd/uspace/lib/libc/arch/amd64/include/syscall.h |
|---|
| 36,6 → 36,8 |
| #ifndef LIBC_amd64_SYSCALL_H_ |
| #define LIBC_amd64_SYSCALL_H_ |
| #define LIBARCH_SYSCALL_GENERIC |
| #include <syscall.h> |
| #endif |
| /branches/dd/uspace/lib/libc/arch/amd64/include/atomic.h |
|---|
| 38,11 → 38,11 |
| #define LIBC_amd64_ATOMIC_H_ |
| static inline void atomic_inc(atomic_t *val) { |
| asm volatile ("lock incq %0\n" : "=m" (val->count)); |
| asm volatile ("lock incq %0\n" : "+m" (val->count)); |
| } |
| static inline void atomic_dec(atomic_t *val) { |
| asm volatile ("lock decq %0\n" : "=m" (val->count)); |
| asm volatile ("lock decq %0\n" : "+m" (val->count)); |
| } |
| static inline long atomic_postinc(atomic_t *val) |
| 52,7 → 52,7 |
| asm volatile ( |
| "movq $1, %0\n" |
| "lock xaddq %0, %1\n" |
| : "=r" (r), "=m" (val->count) |
| : "=r" (r), "+m" (val->count) |
| ); |
| return r; |
| 65,14 → 65,14 |
| asm volatile ( |
| "movq $-1, %0\n" |
| "lock xaddq %0, %1\n" |
| : "=r" (r), "=m" (val->count) |
| : "=r" (r), "+m" (val->count) |
| ); |
| return r; |
| } |
| #define atomic_preinc(val) (atomic_postinc(val)+1) |
| #define atomic_predec(val) (atomic_postdec(val)-1) |
| #define atomic_preinc(val) (atomic_postinc(val) + 1) |
| #define atomic_predec(val) (atomic_postdec(val) - 1) |
| #endif |
| /branches/dd/uspace/lib/libc/arch/amd64/include/config.h |
|---|
| 36,8 → 36,7 |
| #define LIBC_amd64_CONFIG_H_ |
| #define PAGE_WIDTH 12 |
| #define PAGE_SIZE (1<<PAGE_WIDTH) |
| #define PAGE_COLOR_BITS 0 /* dummy */ |
| #define PAGE_SIZE (1 << PAGE_WIDTH) |
| #endif |
| /branches/dd/uspace/lib/libc/arch/amd64/Makefile.inc |
|---|
| 30,11 → 30,11 |
| # |
| TARGET = amd64-linux-gnu |
| TOOLCHAIN_DIR = /usr/local/amd64/bin |
| TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin |
| ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \ |
| arch/$(ARCH)/src/fibril.S \ |
| arch/$(ARCH)/src/tls.c |
| ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \ |
| arch/$(UARCH)/src/fibril.S \ |
| arch/$(UARCH)/src/tls.c |
| LFLAGS += -N |
| /branches/dd/uspace/lib/libc/arch/amd64/src/entry.s |
|---|
| 31,18 → 31,14 |
| .org 0 |
| .globl __entry |
| .globl __entry_driver |
| ## User-space task entry point |
| # |
| # %rdi contains the PCB pointer |
| # |
| __entry: |
| # %rdi was deliberately chosen as the first argument is also in %rdi |
| # Pass PCB pointer to __main (no operation) |
| call __main |
| call __io_init |
| call main |
| call __exit |
| __entry_driver: |
| call __main |
| call main |
| call __exit |