Index: arch/amd64/Makefile.inc =================================================================== --- arch/amd64/Makefile.inc (revision b524f8160fac39354818c5041d71a7fbb61fa89a) +++ arch/amd64/Makefile.inc (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) @@ -16,7 +16,8 @@ arch_sources = arch/dummy.s \ arch/fpu_context.c \ - arch/putchar.c \ arch/boot/boot.S \ arch/boot/memmap.S \ arch/pm.c \ - arch/context.S + arch/context.S \ + arch/drivers/ega.c \ + arch/supplib.c Index: arch/amd64/include/asm.h =================================================================== --- arch/amd64/include/asm.h (revision b524f8160fac39354818c5041d71a7fbb61fa89a) +++ arch/amd64/include/asm.h (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) @@ -33,4 +33,5 @@ #include + void asm_delay_loop(__u32 t); @@ -43,3 +44,76 @@ static inline void cpu_sleep(void) { __asm__("hlt"); }; + +static inline __u8 inb(__u16 port) +{ + __u8 out; + + asm ( + "mov %0, %%dx;" + "inb %%dx,%%al;" + "mov %%al, %1;" + :"=m"(out) + :"m"(port) + :"dx","al" + ); + return out; +} + +static inline __u8 outb(__u16 port,__u8 b) +{ + asm ( + "mov %0,%%dx;" + "mov %1,%%al;" + "outb %%al,%%dx;" + : + :"m"( port), "m" (b) + :"dx","al" + ); +} + +/** Set priority level low + * + * Enable interrupts and return previous + * value of EFLAGS. + */ +static inline pri_t cpu_priority_low(void) { + pri_t v; + __asm__ volatile ( + "pushfq\n" + "popq %0\n" + "sti\n" + : "=r" (v) + ); + return v; +} + +/** Set priority level high + * + * Disable interrupts and return previous + * value of EFLAGS. + */ +static inline pri_t cpu_priority_high(void) { + pri_t v; + __asm__ volatile ( + "pushfq\n" + "popq %0\n" + "cli\n" + : "=r" (v) + ); + return v; +} + +/** Restore priority level + * + * Restore EFLAGS. + */ +static inline void cpu_priority_restore(pri_t pri) { + __asm__ volatile ( + "pushq %0\n" + "popfq\n" + : : "r" (pri) + ); +} + + #endif Index: arch/amd64/src/dummy.s =================================================================== --- arch/amd64/src/dummy.s (revision b524f8160fac39354818c5041d71a7fbb61fa89a) +++ arch/amd64/src/dummy.s (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) @@ -29,11 +29,8 @@ .text -.global memcopy -.global memcpy .global cpu_priority_high .global cpu_priority_low .global cpu_priority_read .global cpu_priority_restore -.global memsetb .global userspace .global before_thread_runs_arch @@ -55,11 +52,8 @@ .global asm_delay_loop -memcpy: -memcopy: cpu_priority_high: cpu_priority_low: cpu_priority_restore: cpu_priority_read: -memsetb: asm_delay_loop: before_thread_runs_arch: Index: arch/amd64/src/gencontext.c =================================================================== --- arch/amd64/src/gencontext.c (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) +++ arch/amd64/src/gencontext.c (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) @@ -0,0 +1,36 @@ +#include + + +typedef long long __u64; +typedef __u64 pri_t; + +#define __amd64_TYPES_H__ +#include "../include/context.h" + +#define FILENAME "context_offset.h" + +int main(void) +{ + FILE *f; + struct context ctx; + struct context *pctx = &ctx; + + f = fopen(FILENAME,"w"); + if (!f) { + perror(FILENAME); + return 1; + } + + fprintf(f,"#define OFFSET_SP 0x%x\n",((int)&pctx->sp) - (int )pctx); + fprintf(f,"#define OFFSET_PC 0x%x\n",((int)&pctx->pc) - (int )pctx); + fprintf(f,"#define OFFSET_RBX 0x%x\n",((int)&pctx->rbx) - (int )pctx); + fprintf(f,"#define OFFSET_RBP 0x%x\n",((int)&pctx->rbp) - (int )pctx); + fprintf(f,"#define OFFSET_R12 0x%x\n",((int)&pctx->r12) - (int )pctx); + fprintf(f,"#define OFFSET_R13 0x%x\n",((int)&pctx->r13) - (int )pctx); + fprintf(f,"#define OFFSET_R14 0x%x\n",((int)&pctx->r14) - (int )pctx); + fprintf(f,"#define OFFSET_R15 0x%x\n",((int)&pctx->r15) - (int )pctx); + fprintf(f,"#define OFFSET_PRI 0x%x\n",((int)&pctx->pri) - (int )pctx); + fclose(f); + + return 0; +} Index: ch/amd64/src/putchar.c =================================================================== --- arch/amd64/src/putchar.c (revision b524f8160fac39354818c5041d71a7fbb61fa89a) +++ (revision ) @@ -1,35 +1,0 @@ -/* - * Copyright (C) 2005 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -#include -#include - - -void putchar(const char ch) -{ -} Index: arch/amd64/src/supplib.c =================================================================== --- arch/amd64/src/supplib.c (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) +++ arch/amd64/src/supplib.c (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2005 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +#include + +/* TODO: Rewrite to assembler */ + +char *memcpy(void *dst, const void *src, size_t cnt) +{ + _memcopy(dst, src, cnt); +} + +char *memcopy(void * dst, const void *src, size_t cnt) +{ + _memcopy(dst, src, cnt); +} + +void memsetw(__address dst, size_t cnt, __u16 x) +{ + _memsetw(dst, cnt, x); +} + +void memsetb(__address dst, size_t cnt, __u8 x) +{ + _memsetb(dst, cnt, x); +} + Index: include/memstr.h =================================================================== --- include/memstr.h (revision b524f8160fac39354818c5041d71a7fbb61fa89a) +++ include/memstr.h (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) @@ -33,4 +33,5 @@ #include +extern char *memcpy(void * dst, const void *src, size_t cnt); extern char *memcopy(void * dst, const void *src, size_t cnt); @@ -45,4 +46,5 @@ extern char *_memcopy(void *dst, const void *src, size_t cnt); extern void _memsetb(__address dst, size_t cnt, __u8 x); +extern void _memsetw(__address dst, size_t cnt, __u16 x); #endif Index: src/build.amd64 =================================================================== --- src/build.amd64 (revision b524f8160fac39354818c5041d71a7fbb61fa89a) +++ src/build.amd64 (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) @@ -2,5 +2,9 @@ set -e +# Generate context_offset.h +(cd ../arch/amd64/src;make gencontext;./gencontext) +# Create links to ia32 architecture +ln -sf ../../../arch/ia32/src/drivers ../arch/amd64/src/ +ln -sf ../../../arch/ia32/include/ega.h ../arch/amd64/include/ -(cd ../arch/amd64/src;make gencontext;./gencontext) make all ARCH=amd64 Index: src/lib/memstr.c =================================================================== --- src/lib/memstr.c (revision b524f8160fac39354818c5041d71a7fbb61fa89a) +++ src/lib/memstr.c (revision 379d73f3869a721fb39fb9f14fbf938a005c8aa6) @@ -71,2 +71,21 @@ p[i] = x; } + +/** Fill block of memory + * + * Fill cnt words at dst address with the value x. + * The filling is done word-by-word. + * + * @param dst Origin address to fill. + * @param cnt Number of words to fill. + * @param x Value to fill. + * + */ +void _memsetw(__address dst, size_t cnt, __u16 x) +{ + int i; + __u8 *p = (__u8 *) dst; + + for(i=0; i