Remove pmach.h

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@486 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 19 insertions, 86 deletions

diff --git a/misc/pascal/include/keywords.h b/misc/pascal/include/keywords.h
index af87a832f..ebbed36f1 100644
--- a/misc/pascal/include/keywords.h
+++ b/misc/pascal/include/keywords.h
@@ -31,6 +31,7 @@
  * 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.

+ *

  *************************************************************/

 

 #ifndef __KEYWORDS_H

diff --git a/misc/pascal/include/pmach.h b/misc/pascal/include/pmach.h
deleted file mode 100644
index c7bc42e3a..000000000
--- a/misc/pascal/include/pmach.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/**********************************************************************

- * File:        pmach.h

- * Description: Definitions associated with the simulated P-Machine

- * Author:      Gregory Nutt

- * Modified:

- **********************************************************************/

-

-#ifndef __PMACH_H

-#define __PMACH_H

-

-/**********************************************************************

- * Definitions

- **********************************************************************/

-

-#define MIN_PROGRAM_COUNTER   0

-

-/**********************************************************************

- * Global Type Definitions

- **********************************************************************/

-

-typedef uint16 uStackType; /* Stack values are 16-bits in length */

-typedef sint16 sStackType;

-typedef uint16 addrType;   /* Addresses are 16-bits in length */

-typedef uint16 levelType;  /* Limits to MAXUINT16 levels */

-typedef uint16 labelType;  /* Limits to MAXUINT16 labels */

-

-#define BPERI         2

-#define ITOBSTACK(i)  ((i) << 1)

-#define BTOISTACK(i)  ((i) >> 1)

-#define ROUNDBTOI(i)  (((i) + 1) >> 1)

-#define STACKALIGN(i) (((i) + 1) & ~1)

-

-union stack_u

-{

-  uStackType *i;

-  ubyte      *b;

-};

-typedef union stack_u stackType;

-

-/**********************************************************************

- * Global Variables

- **********************************************************************/

-

-/* This is the emulated P-Machine stack (D-Space) */

-

-extern stackType stack;

-

-/* This is the emulated P-Machine instruction space */

-

-extern ubyte *iSpace;

-

-/* These are the emulated P-Machine registers:

- *

- * baseReg: Base Register of the current stack frame.  Holds the address

- *     of the base of the stack frame of the current block.

- * topOfStringStack: The current top of the stack used to manage string

- *     storage

- * topOfStack: The Pascal stack pointer

- * programCounter: Holds the current p-code location

- */

-

-extern addrType baseReg;

-extern addrType topOfStringStack;

-extern addrType topOfStack;

-extern addrType programCounter;

-

-/* Configuration variables

- *

- * readOnlyData: Stack address of read-only data

- * bottomOfStack: Initial Value of the stack pointer

- * sizeOfStack: Total allocated size of the Pascal stack

- * maxProgramCounter: Address of last valid P-Code

- * entryPoint: This is the address where execution begins.

- */

-

-extern addrType readOnlyData;

-extern addrType bottomOfStack;

-extern addrType sizeOfStack;

-extern addrType maxProgramCounter;

-extern uint32   entryPoint;

-

-#endif /* __PMACH_H */

diff --git a/misc/pascal/insn16/include/pexec.h b/misc/pascal/insn16/include/pexec.h
index de35589d9..2b705ea34 100644
--- a/misc/pascal/insn16/include/pexec.h
+++ b/misc/pascal/insn16/include/pexec.h
@@ -44,10 +44,27 @@
  * Definitions

  ****************************************************************************/

 

+#define BPERI         2

+#define ITOBSTACK(i)  ((i) << 1)

+#define BTOISTACK(i)  ((i) >> 1)

+#define ROUNDBTOI(i)  (((i) + 1) >> 1)

+

 /****************************************************************************

  * Type Definitions

  ****************************************************************************/

 

+typedef uint16 uStackType; /* Stack values are 16-bits in length */

+typedef sint16 sStackType;

+typedef uint16 addrType;   /* Addresses are 16-bits in length */

+typedef uint16 levelType;  /* Limits to MAXUINT16 levels */

+

+union stack_u

+{

+  uStackType *i;

+  ubyte      *b;

+};

+typedef union stack_u stackType;

+

 /* This structure describes the parameters needed to initialize the p-code

  * interpreter.

  */

diff --git a/misc/pascal/insn16/prun/pdbg.c b/misc/pascal/insn16/prun/pdbg.c
index 54ebefa39..ee5ea1245 100644
--- a/misc/pascal/insn16/prun/pdbg.c
+++ b/misc/pascal/insn16/prun/pdbg.c
@@ -49,7 +49,6 @@
 #include "pinsn16.h"

 #include "pxdefs.h"

 #include "pedefs.h"

-#include "pmach.h"

 

 #include "paslib.h"

 #include "pinsn.h"

diff --git a/misc/pascal/insn16/prun/pexec.c b/misc/pascal/insn16/prun/pexec.c
index d2caca850..e3d1c1793 100644
--- a/misc/pascal/insn16/prun/pexec.c
+++ b/misc/pascal/insn16/prun/pexec.c
@@ -49,7 +49,6 @@
 #include "pfdefs.h"

 #include "pxdefs.h"

 #include "pedefs.h"

-#include "pmach.h"

 

 #include "paslib.h"

 #include "pexec.h"

diff --git a/misc/pascal/insn16/prun/pload.c b/misc/pascal/insn16/prun/pload.c
index e71026256..b460a9079 100644
--- a/misc/pascal/insn16/prun/pload.c
+++ b/misc/pascal/insn16/prun/pload.c
@@ -38,10 +38,10 @@
  ****************************************************************************/

 

 #include <stdio.h>

+#include <stdlib.h>

 #include <errno.h>

 

 #include "keywords.h"

-#include "pmach.h"

 #include "pedefs.h"

 #include "pofflib.h"

 #include "perr.h"

diff --git a/misc/pascal/insn16/prun/prun.c b/misc/pascal/insn16/prun/prun.c
index cc7c91111..6ad478b2b 100644
--- a/misc/pascal/insn16/prun/prun.c
+++ b/misc/pascal/insn16/prun/prun.c
@@ -49,7 +49,6 @@
 #include "pinsn16.h"

 #include "pxdefs.h"

 #include "pedefs.h"

-#include "pmach.h"

 

 #include "paslib.h"

 #include "perr.h"