Fix comiple-error.

But kon does not work on 4-current(with new syscons).
Now I'll fix this problem.

Submitted by:	Issei Suzuki <issei@issei.org>
Obtained from:	http://home.jp.freebsd.org/cgi-bin/showmail/ports-jp/8671
This commit is contained in:
Shigeyuki Fukushima 2000-01-30 12:59:16 +00:00
parent d4f4c80977
commit a334a8034e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=25311
4 changed files with 91 additions and 0 deletions

View File

@ -0,0 +1,35 @@
diff -ur include/mem.h.old include/mem.h
--- include/mem.h.old Tue Jan 25 20:16:57 2000
+++ include/mem.h Tue Jan 25 20:30:48 2000
@@ -46,6 +46,7 @@
"d" ((u_short) port));
}
+#if 0
static inline
void lzero(void *head, int n)
{
@@ -93,11 +94,23 @@
"D" ((long)head)
:"cx","di");
}
+#endif
extern u_char PortInb(u_short);
+#if 1
+#define bzero(b, len) bzero(b, len)
+#define bzero2(b, len) bzero(b, len)
+#define lzero(b, len) bzero(b, len)
+#define wzero(b, len) bzero(b, len)
+#define bmove(dst, src, len) bcopy(src, dst, len)
+#define brmove(dst, src, len) bcopy(src, dst, len)
+#define wmove(dst, src, len) bcopy(src, dst, len)
+#define lmove(dst, src, len) bcopy(src, dst, len)
+#else
extern void wzero(void *, int);
extern void wmove(void *, void *, int);
extern void lmove(void *, void *, int);
+#endif
extern void SafeFree(void **);
#endif

View File

@ -0,0 +1,19 @@
diff -ur lib/mem.c.old lib/mem.c
--- lib/mem.c.old Tue Jan 25 20:16:57 2000
+++ lib/mem.c Tue Jan 25 20:28:18 2000
@@ -44,6 +44,7 @@
return(_rval);
}
+#if 0
void wzero(void *head, int n)
{
__asm__ ("cld\n\t"
@@ -76,6 +77,7 @@
"S" ((long)src)
:"cx","di","si");
}
+#endif
void SafeFree(void **p)
{

View File

@ -0,0 +1,12 @@
diff -ur src/main.c.old src/main.c
--- src/main.c.old Tue Jan 25 20:16:57 2000
+++ src/main.c Tue Jan 25 20:32:52 2000
@@ -34,7 +34,7 @@
#include <version.h>
#include <term.h>
-void main(int argc, const char *argv[])
+int main(int argc, const char *argv[])
{
char *p;

View File

@ -0,0 +1,25 @@
diff -ur src/vc.c.old src/vc.c
--- src/vc.c.old Tue Jan 25 20:16:57 2000
+++ src/vc.c Tue Jan 25 20:32:35 2000
@@ -100,8 +100,8 @@
"\t andb %%bl, (%%eax)\n"
"\t incl %%eax\n"
"\t loop 1b\n"
- :
- : "eax" ((long)head), "bl" (0x7F), "c" (n)
+ : "=bl" (head), "=c" (n)
+ : "eax" ((long)head), "0" (0x7F), "1" (n)
: "bl", "cx" );
}
@@ -114,8 +114,8 @@
"\t andl %%ebx, (%%eax)\n"
"\t addl $4, %%eax\n"
"\t loop 1b\n"
- :
- : "eax" ((long)head), "ebx" (0x7F7F7F7F), "c" (n>>2)
+ : "=ebx" (head), "=c" (n)
+ : "eax" ((long)head), "0" (0x7F7F7F7F), "1" (n>>2)
: "ebx", "cx" );
}