Change counter-intuitive pc@ and pc! to inb and outb.

Submitted by:	jkh

5 files changed, 22 insertions, 20 deletions

diff --git a/sys/boot/ficl/alpha/sysdep.c b/sys/boot/ficl/alpha/sysdep.c
index 56194fd..84a704d 100644
--- a/sys/boot/ficl/alpha/sysdep.c
+++ b/sys/boot/ficl/alpha/sysdep.c
@@ -12,10 +12,10 @@
 #include <stdlib.h>
 #else
 #include <stand.h>
-#endif
 #ifdef __i386__
 #include <machine/cpufunc.h>
 #endif
+#endif
 #include "ficl.h"
 
 /*
@@ -73,11 +73,11 @@ void  ficlFree   (void *p)
 
 #ifdef __i386__
 /* 
- * pc! ( port# c -- )
+ * outb ( port# c -- )
  * Store a byte to I/O port number port#
  */
 void
-pc_store(FICL_VM *pVM)
+ficlOutb(FICL_VM *pVM)
 {
 	u_char c;
 	u_int32_t port;
@@ -88,11 +88,11 @@ pc_store(FICL_VM *pVM)
 }
 
 /*
- * pc@ ( port# -- c )
+ * inb ( port# -- c )
  * Fetch a byte from I/O port number port#
  */
 void
-pc_fetch(FICL_VM *pVM)
+ficlInb(FICL_VM *pVM)
 {
 	u_char c;
 	u_int32_t port;
diff --git a/sys/boot/ficl/ficl.h b/sys/boot/ficl/ficl.h
index 3eea201..3fcb32e 100644
--- a/sys/boot/ficl/ficl.h
+++ b/sys/boot/ficl/ficl.h
@@ -761,9 +761,9 @@ void       ficlCompileSoftCore(FICL_VM *pVM);
 void       constantParen(FICL_VM *pVM);
 void       twoConstParen(FICL_VM *pVM);
 
-#ifdef __i386__
-extern void pc_fetch(FICL_VM *pVM);
-extern void pc_store(FICL_VM *pVM);
+#if defined(__i386__) && !defined(TESTMAIN)
+extern void ficlOutb(FICL_VM *pVM);
+extern void ficlInb(FICL_VM *pVM);
 #endif
 
 #ifdef __cplusplus
diff --git a/sys/boot/ficl/i386/sysdep.c b/sys/boot/ficl/i386/sysdep.c
index 56194fd..84a704d 100644
--- a/sys/boot/ficl/i386/sysdep.c
+++ b/sys/boot/ficl/i386/sysdep.c
@@ -12,10 +12,10 @@
 #include <stdlib.h>
 #else
 #include <stand.h>
-#endif
 #ifdef __i386__
 #include <machine/cpufunc.h>
 #endif
+#endif
 #include "ficl.h"
 
 /*
@@ -73,11 +73,11 @@ void  ficlFree   (void *p)
 
 #ifdef __i386__
 /* 
- * pc! ( port# c -- )
+ * outb ( port# c -- )
  * Store a byte to I/O port number port#
  */
 void
-pc_store(FICL_VM *pVM)
+ficlOutb(FICL_VM *pVM)
 {
 	u_char c;
 	u_int32_t port;
@@ -88,11 +88,11 @@ pc_store(FICL_VM *pVM)
 }
 
 /*
- * pc@ ( port# -- c )
+ * inb ( port# -- c )
  * Fetch a byte from I/O port number port#
  */
 void
-pc_fetch(FICL_VM *pVM)
+ficlInb(FICL_VM *pVM)
 {
 	u_char c;
 	u_int32_t port;
diff --git a/sys/boot/ficl/sysdep.c b/sys/boot/ficl/sysdep.c
index 56194fd..84a704d 100644
--- a/sys/boot/ficl/sysdep.c
+++ b/sys/boot/ficl/sysdep.c
@@ -12,10 +12,10 @@
 #include <stdlib.h>
 #else
 #include <stand.h>
-#endif
 #ifdef __i386__
 #include <machine/cpufunc.h>
 #endif
+#endif
 #include "ficl.h"
 
 /*
@@ -73,11 +73,11 @@ void  ficlFree   (void *p)
 
 #ifdef __i386__
 /* 
- * pc! ( port# c -- )
+ * outb ( port# c -- )
  * Store a byte to I/O port number port#
  */
 void
-pc_store(FICL_VM *pVM)
+ficlOutb(FICL_VM *pVM)
 {
 	u_char c;
 	u_int32_t port;
@@ -88,11 +88,11 @@ pc_store(FICL_VM *pVM)
 }
 
 /*
- * pc@ ( port# -- c )
+ * inb ( port# -- c )
  * Fetch a byte from I/O port number port#
  */
 void
-pc_fetch(FICL_VM *pVM)
+ficlInb(FICL_VM *pVM)
 {
 	u_char c;
 	u_int32_t port;
diff --git a/sys/boot/ficl/words.c b/sys/boot/ficl/words.c
index 3d71c3c..c76c169 100644
--- a/sys/boot/ficl/words.c
+++ b/sys/boot/ficl/words.c
@@ -4386,8 +4386,10 @@ void ficlCompileCore(FICL_DICT *dp)
     dictAppendWord(dp, "ms",        ms,             FW_DEFAULT);
     dictAppendWord(dp, "seconds",   pseconds,       FW_DEFAULT);
 #ifdef __i386__
-    dictAppendWord(dp, "pc!",       pc_store,       FW_DEFAULT);
-    dictAppendWord(dp, "pc@",       pc_fetch,       FW_DEFAULT);
+#ifndef TESTMAIN
+    dictAppendWord(dp, "outb",      ficlOutb,       FW_DEFAULT);
+    dictAppendWord(dp, "inb",       ficlInb,        FW_DEFAULT);
+#endif
     ficlSetEnv("arch-i386",         FICL_TRUE);
 #else
     ficlSetEnv("arch-i386",         FICL_FALSE);