Changeset 379d73f3 in mainline

Timestamp:

2005-08-30T22:11:45Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c5ae095

Parents:

b524f816

Message:

Added putchar to AMD

Files:

• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/amd64/include/asm.h (modified) (2 diffs)
• arch/amd64/src/dummy.s (modified) (2 diffs)
• arch/amd64/src/gencontext.c (added)
• arch/amd64/src/supplib.c (moved) (moved from arch/amd64/src/putchar.c ) (2 diffs)
• include/memstr.h (modified) (2 diffs)
• src/build.amd64 (modified) (1 diff)
• src/lib/memstr.c (modified) (1 diff)

arch/amd64/Makefile.inc

@@ -16 +16 @@
 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

arch/amd64/include/asm.h

@@ -33 +33 @@
 #include <config.h>
 
+
 void asm_delay_loop(__u32 t);
 
@@ -43 +44 @@
 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

arch/amd64/src/dummy.s

@@ -29 +29 @@
 .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 +52 @@
 .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:

arch/amd64/src/supplib.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2005 Martin Decky
+ * Copyright (C) 2005 Ondrej Palkovsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#include <putchar.h>
-#include <arch/types.h>
+#include <memstr.h>
 
+/* TODO: Rewrite to assembler */
 
-void putchar(const char ch)
+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);
+}
+

include/memstr.h

@@ -33 +33 @@
 #include <arch/types.h>
 
+extern char *memcpy(void * dst, const void *src, size_t cnt);
 extern char *memcopy(void * dst, const void *src, size_t cnt);
 
@@ -45 +46 @@
 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

src/build.amd64

@@ -2 +2 @@
 
 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

src/lib/memstr.c

@@ -71 +71 @@
                 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<cnt; i++)
+                p[i] = x;       
+}