Minor - formatting enhancements; add memset_far funcs.

Use consistent types in mtrr.c.
Remove extra ';' from lds files.
Report found serial and lpt ports.
Remove extra newlines from inline asm.
Add memset_far and memset16_far functions.

diff --git a/src/mtrr.c b/src/mtrr.c
index d14a25c4ba683e969046b7bd83213bf942e5eaad..12837e00c6d3dc50bcc6ef31be52d8c3d50733a7 100644 (file)
--- a/src/mtrr.c
+++ b/src/mtrr.c
@@ -24,15 +24,14 @@
 #define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg))
 #define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1)
 
-static u64 rdmsr(unsigned index)
+static u64 rdmsr(u32 index)
 {
-    unsigned long long ret;
-
+    u64 ret;
     asm ("rdmsr" : "=A"(ret) : "c"(index));
     return ret;
 }
 
-static void wrmsr(unsigned index, u64 val)
+static void wrmsr(u32 index, u64 val)
 {
     asm volatile ("wrmsr" : : "c"(index), "A"(val));
 }

diff --git a/src/rombios.lds.S b/src/rombios.lds.S
index a6afe1fc50889bafe19ad4ec649a20b997976741..20f7bfb1387f383c2221c937b2b05ac42a1b7a3a 100644 (file)
--- a/src/rombios.lds.S
+++ b/src/rombios.lds.S
@@ -1,12 +1,12 @@
 // Linker definitions for merging 16 and 32 bit code
 //
-// Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2008,2009  Kevin O'Connor <kevin@koconnor.net>
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH("i386")
-ENTRY(post32);
+ENTRY(post32)
 SECTIONS
 {
         .text code32_start : {

diff --git a/src/util.c b/src/util.c
index 3c7117c4f7213ece58523bdfd306b5a023f565e7..1a67e3705a65b4443058a7a210a376d091451bc7 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1,6 +1,6 @@
 // Misc utility functions.
 //
-// Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2008,2009  Kevin O'Connor <kevin@koconnor.net>
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
@@ -18,9 +18,9 @@ call16(struct bregs *callregs)
 #if MODE16 == 1
         "calll __call16\n"
         "cli\n"
-        "cld\n"
+        "cld"
 #else
-        "calll __call16_from32\n"
+        "calll __call16_from32"
 #endif
         : "+a" (callregs), "+m" (*callregs)
         :
@@ -35,7 +35,7 @@ call16big(struct bregs *callregs)
         __force_link_error__call16big_only_in_32bit_mode();
 
     asm volatile(
-        "calll __call16big_from32\n"
+        "calll __call16big_from32"
         : "+a" (callregs), "+m" (*callregs)
         :
         : "ebx", "ecx", "edx", "esi", "edi", "cc", "memory");
@@ -65,7 +65,7 @@ call16_simpint(int nr, u32 *eax, u32 *flags)
         "pushfl\n"
         "popl %1\n"
         "cli\n"
-        "cld\n"
+        "cld"
         : "+a"(*eax), "=r"(*flags)
         : "i"(nr)
         : "cc", "memory");
@@ -94,7 +94,7 @@ stack_hop(u32 eax, u32 edx, u32 ecx, void *func)
         // Restore segments and stack
         "movw %w3, %%ds\n"
         "movw %w3, %%ss\n"
-        "movl %4, %%esp\n"
+        "movl %4, %%esp"
         : "+a" (eax), "+d" (edx), "+c" (ecx), "=&r" (bkup_ss), "=&r" (bkup_esp)
         : "i" (EBDA_OFFSET_TOP_STACK), "r" (ebda_seg), "m" (*(u8*)func)
         : "cc", "memory");
@@ -158,6 +158,29 @@ strcmp(const char *s1, const char *s2)
     }
 }
 
+inline void
+memset_far(u16 d_seg, void *d_far, u8 c, size_t len)
+{
+    SET_SEG(ES, d_seg);
+    asm volatile(
+        "rep stosb %%es:(%%di)"
+        : "+c"(len), "+D"(d_far)
+        : "a"(c)
+        : "cc", "memory");
+}
+
+inline void
+memset16_far(u16 d_seg, void *d_far, u16 c, size_t len)
+{
+    len /= 2;
+    SET_SEG(ES, d_seg);
+    asm volatile(
+        "rep stosw %%es:(%%di)"
+        : "+c"(len), "+D"(d_far)
+        : "a"(c)
+        : "cc", "memory");
+}
+
 void *
 memset(void *s, int c, size_t n)
 {
@@ -175,7 +198,7 @@ memcpy_far(u16 d_seg, void *d_far, u16 s_seg, const void *s_far, size_t len)
         "movw %%ds, %w0\n"
         "movw %w4, %%ds\n"
         "rep movsb (%%si),%%es:(%%di)\n"
-        "movw %w0, %%ds\n"
+        "movw %w0, %%ds"
         : "=&r"(bkup_ds), "+c"(len), "+S"(s_far), "+D"(d_far)
         : "r"(s_seg)
         : "cc", "memory");
@@ -187,7 +210,7 @@ memcpy4(void *d1, const void *s1, size_t len)
 {
     len /= 4;
     asm volatile(
-        "rep movsl (%%esi),%%es:(%%edi)\n"
+        "rep movsl (%%esi),%%es:(%%edi)"
         : "+c"(len), "+S"(s1), "+D"(d1)
         : : "cc", "memory");
 }

diff --git a/src/util.h b/src/util.h
index 5dbbca22fe3140b40d2080527e06377c0d4a2ae3..1d33c9474a5144b1a861b41902521b1768c90e59 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,6 @@
 // Basic x86 asm functions and function defs.
 //
-// Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2008,2009  Kevin O'Connor <kevin@koconnor.net>
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 #ifndef __UTIL_H
@@ -72,6 +72,8 @@ u8 checksum(void *buf, u32 len);
 int memcmp(const void *s1, const void *s2, size_t n);
 size_t strlen(const char *s);
 int strcmp(const char *s1, const char *s2);
+inline void memset_far(u16 d_seg, void *d_far, u8 c, size_t len);
+inline void memset16_far(u16 d_seg, void *d_far, u16 c, size_t len);
 void *memset(void *s, int c, size_t n);
 void memcpy4(void *d1, const void *s1, size_t len);
 #define memcpy(d1, s1, len) __builtin_memcpy((d1), (s1), (len))