summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-05-09 08:52:11 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-05-09 08:52:11 -0600
commitb373fc5405bc34fe4889a67d9a856c9228ae1240 (patch)
tree4dcde4ad339f61611ef2a291d3e52644d91ea4a8
parent56078d9f356c73497be755f6a912b7d2da6c66e8 (diff)
downloadnuttx-b373fc5405bc34fe4889a67d9a856c9228ae1240.tar.gz
nuttx-b373fc5405bc34fe4889a67d9a856c9228ae1240.tar.bz2
nuttx-b373fc5405bc34fe4889a67d9a856c9228ae1240.zip
Create P-Code execution helper in apps/interpreters/prun; The P-Code binary format is functional except that there are still some modularity and kernel build issues that need to be addressed.
-rw-r--r--apps/ChangeLog.txt3
-rw-r--r--apps/examples/pashello/Kconfig17
-rw-r--r--apps/examples/pashello/pashello.c63
-rw-r--r--apps/examples/pashello/pashello.h2
-rw-r--r--apps/include/interpreters/prun.h90
-rw-r--r--apps/interpreters/Kconfig1
-rw-r--r--apps/interpreters/Make.defs4
-rw-r--r--apps/interpreters/Makefile2
-rw-r--r--apps/interpreters/README.txt5
-rw-r--r--apps/interpreters/prun/.gitignore13
-rw-r--r--apps/interpreters/prun/Kconfig14
-rw-r--r--apps/interpreters/prun/Makefile105
-rw-r--r--apps/interpreters/prun/README.txt34
-rw-r--r--apps/interpreters/prun/prun.c130
-rw-r--r--apps/interpreters/prun/prun.h55
-rw-r--r--nuttx/ChangeLog9
-rw-r--r--nuttx/binfmt/Kconfig2
-rw-r--r--nuttx/binfmt/libpcode/Kconfig14
-rw-r--r--nuttx/binfmt/libpcode/README.txt67
-rw-r--r--nuttx/binfmt/pcode.c26
-rw-r--r--nuttx/configs/sim/pashello/defconfig1
-rw-r--r--nuttx/configs/xtrs/pashello/defconfig1
-rw-r--r--nuttx/configs/z16f2800100zcog/pashello/defconfig1
-rw-r--r--nuttx/configs/z80sim/pashello/defconfig1
24 files changed, 604 insertions, 56 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index c84c26adb..b4ab12f0b 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -911,3 +911,6 @@
* apps/system/i2c/i2c_get.c: Fix to show the updated register address on
each fetch (vs. showing the same starting address each time). From
Ryan VanSickle (2014-5-8).
+ * apps/interpreters/prun and apps/include/interpreters/prun.h: Broke out
+ the P-code execution logic from apps/examples/pashello and moved it to
+ these directorit where it can be used more generally (2014-5-9).
diff --git a/apps/examples/pashello/Kconfig b/apps/examples/pashello/Kconfig
index 5591d6b5b..c13490677 100644
--- a/apps/examples/pashello/Kconfig
+++ b/apps/examples/pashello/Kconfig
@@ -6,8 +6,25 @@
config EXAMPLES_PASHELLO
bool "Pascal \"Hello, World!\" example"
default n
+ depends on INTERPRETERS_PCODE
+ select INTERPRETERS_PRUN
---help---
Enable the Pascal \"Hello, World!\" example
if EXAMPLES_PASHELLO
+
+config EXAMPLES_PASHELLO_VARSTACKSIZE
+ int "P-Code variable stack size"
+ default 1024
+ ---help---
+ This size of the P-Code variable storage area to be allocated by the
+ P-Code runtime.
+
+config EXAMPLES_PASHELLO_STRSTACKSIZE
+ int "P-Code string stack size"
+ default 128
+ ---help---
+ This size of the P-Code string stack area to be allocated by the
+ P-Code runtime.
+
endif
diff --git a/apps/examples/pashello/pashello.c b/apps/examples/pashello/pashello.c
index 8f9fc8b22..50c61d48c 100644
--- a/apps/examples/pashello/pashello.c
+++ b/apps/examples/pashello/pashello.c
@@ -43,20 +43,18 @@
#include <stdlib.h>
#include <debug.h>
-#include "pexec.h"
-#include "pedefs.h"
-#include "pashello.h"
+#include <apps/interpreters/prun.h>
/****************************************************************************
* Definitions
****************************************************************************/
-#ifndef CONFIG_PASHELLO_VARSTACKSIZE
-# define CONFIG_PASHELLO_VARSTACKSIZE 1024
+#ifndef CONFIG_EXAMPLES_PASHELLO_VARSTACKSIZE
+# define CONFIG_EXAMPLES_PASHELLO_VARSTACKSIZE 1024
#endif
-#ifndef CONFIG_PASHELLO_STRSTACKSIZE
-# define CONFIG_PASHELLO_STRSTACKSIZE 128
+#ifndef CONFIG_EXAMPLES_PASHELLO_STRSTACKSIZE
+# define CONFIG_EXAMPLES_PASHELLO_STRSTACKSIZE 128
#endif
/****************************************************************************
@@ -68,33 +66,6 @@
****************************************************************************/
/****************************************************************************
- * Name: prun
- *
- * Description:
- * This function executes the P-Code program until a stopping condition
- * is encountered.
- *
- ****************************************************************************/
-
-static void prun(FAR struct pexec_s *st)
-{
- int errcode;
-
- for (;;)
- {
- /* Execute the instruction; Check for exceptional conditions */
-
- errcode = pexec(st);
- if (errcode != eNOERROR) break;
- }
-
- if (errcode != eEXIT)
- {
- printf("Runtime error 0x%02x -- Execution Stopped\n", errcode);
- }
-}
-
-/****************************************************************************
* Public Functions
****************************************************************************/
@@ -105,29 +76,23 @@ static void prun(FAR struct pexec_s *st)
int pashello_main(int argc, FAR char *argv[])
{
FAR struct pexec_s *st;
+ int exitcode = EXIT_SUCCESS;
+ int ret;
/* Register the /dev/hello driver */
hello_register();
- /* Load the POFF file */
+ /* Execute the POFF file */
- st = pload("/dev/hello", CONFIG_PASHELLO_VARSTACKSIZE, CONFIG_PASHELLO_STRSTACKSIZE);
- if (!st)
+ ret = prun("/dev/hello", CONFIG_EXAMPLES_PASHELLO_VARSTACKSIZE,
+ CONFIG_EXAMPLES_PASHELLO_STRSTACKSIZE);
+ if (ret < 0)
{
- fprintf(stderr, "pashello_main: ERROR: Could not load /dev/hello\n");
- exit(1);
+ fprintf(stderr, "pashello_main: ERROR: Execution failed\n");
+ exitcode = EXIT_FAILURE;
}
- printf("pashello_main: /dev/hello Loaded\n");
- printf("pashello_main: Interpreter started:\n");
-
- /* And start program execution */
-
- prun(st);
-
- /* Clean up resources used by the interpreter */
printf("pashello_main: Interpreter terminated");
- pexec_release(st);
- return 0;
+ return exitcode;
}
diff --git a/apps/examples/pashello/pashello.h b/apps/examples/pashello/pashello.h
index ac5f99fbe..6a550764c 100644
--- a/apps/examples/pashello/pashello.h
+++ b/apps/examples/pashello/pashello.h
@@ -50,6 +50,6 @@
/* Defined in device.c */
-extern void hello_register(void);
+void hello_register(void);
#endif /* __EXAMPLES_PASHELLO_H */
diff --git a/apps/include/interpreters/prun.h b/apps/include/interpreters/prun.h
new file mode 100644
index 000000000..e895e9902
--- /dev/null
+++ b/apps/include/interpreters/prun.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+ * apps/include/interpreters/prun.h
+ *
+ * Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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 __APPS_INCLUDE_INTERPRETERS_PRUN_H
+#define __APPS_INCLUDE_INTERPRETERS_PRUN_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: prun
+ *
+ * Description:
+ * Execute/interpret a P-Code file. This function does not return until
+ * the P-code program terminates or until a fatal error occurs.
+ *
+ * Input Parameters:
+ * exepath - The full path to the P-Code binary.
+ * varsize - Size of the P-Code variable stack
+ * strsize - the size of the P-Code string stack.
+ *
+ * Returned Value:
+ * OK if the P-Code program successfully terminated; A negated errno value
+ * is returned on the event of any failure.
+ *
+ ****************************************************************************/
+
+int prun(FAR char *exepath, size_t varsize, size_t strsize);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __APPS_INCLUDE_INTERPRETERS_PRUN_H */
diff --git a/apps/interpreters/Kconfig b/apps/interpreters/Kconfig
index 637dd13c5..0464b6c77 100644
--- a/apps/interpreters/Kconfig
+++ b/apps/interpreters/Kconfig
@@ -15,5 +15,6 @@ config INTERPRETERS_PCODE
Pascal run-time code.
if INTERPRETERS_PCODE
+source "$APPSDIR/interpreters/prun/Kconfig"
endif
diff --git a/apps/interpreters/Make.defs b/apps/interpreters/Make.defs
index 5d808d5d6..17364be39 100644
--- a/apps/interpreters/Make.defs
+++ b/apps/interpreters/Make.defs
@@ -38,6 +38,10 @@ ifeq ($(CONFIG_INTERPRETERS_PCODE),y)
CONFIGURED_APPS += interpreters/pcode
endif
+ifeq ($(CONFIG_INTERPRETERS_PRUN),y)
+CONFIGURED_APPS += interpreters/prun
+endif
+
ifeq ($(CONFIG_INTERPRETERS_FICL),y)
CONFIGURED_APPS += interpreters/ficl
endif
diff --git a/apps/interpreters/Makefile b/apps/interpreters/Makefile
index f78528714..735038cd6 100644
--- a/apps/interpreters/Makefile
+++ b/apps/interpreters/Makefile
@@ -37,7 +37,7 @@
# Sub-directories containing interpreter runtime
-SUBDIRS = pcode ficl
+SUBDIRS = pcode prun ficl
# Create the list of installed runtime modules (INSTALLED_DIRS)
diff --git a/apps/interpreters/README.txt b/apps/interpreters/README.txt
index 9023ee5a5..f4f990b57 100644
--- a/apps/interpreters/README.txt
+++ b/apps/interpreters/README.txt
@@ -60,3 +60,8 @@ pcode
CONFIG_EXAMPLES_PASHELLO=y
CONFIG_INTERPRETERS_PCODE=y
+
+prun
+
+ This directory holds some simple, convenience functions to simplify and
+ standardize the interaction with the P-Code library.
diff --git a/apps/interpreters/prun/.gitignore b/apps/interpreters/prun/.gitignore
new file mode 100644
index 000000000..3e5ec9dcb
--- /dev/null
+++ b/apps/interpreters/prun/.gitignore
@@ -0,0 +1,13 @@
+/Make.dep
+/.depend
+/.built
+/*.o1
+/*.asm
+/*.obj
+/*.rel
+/*.lst
+/*.sym
+/*.adb
+/*.lib
+/*.src
+/*.err
diff --git a/apps/interpreters/prun/Kconfig b/apps/interpreters/prun/Kconfig
new file mode 100644
index 000000000..1f8ba4695
--- /dev/null
+++ b/apps/interpreters/prun/Kconfig
@@ -0,0 +1,14 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config INTERPRETERS_PRUN
+ bool "Pascal P-Code interpreter"
+ default n
+ depends on INTERPRETERS_PCODE
+ ---help---
+ Build the Pascal P-Code interpreter / Virtual machine
+
+if INTERPRETERS_PRUN
+endif
diff --git a/apps/interpreters/prun/Makefile b/apps/interpreters/prun/Makefile
new file mode 100644
index 000000000..941284fae
--- /dev/null
+++ b/apps/interpreters/prun/Makefile
@@ -0,0 +1,105 @@
+############################################################################
+# apps/interpreters/prun/Makefile
+#
+# Copyright (C) 2014 Gregory Nutt. All rights reserved.
+# Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# 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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+include $(APPDIR)/Make.defs
+
+# Pascal P-Code interpreter / Virtual machine
+
+ifeq ($(WINTOOL),y)
+INCDIROPT = -w
+endif
+
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+ "." \
+ "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)include" \
+ "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)insn$(DELIM)include"}
+
+ASRCS =
+CSRCS = prun.c
+
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
+
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+ BIN = ..\..\libapps$(LIBEXT)
+else
+ifeq ($(WINTOOL),y)
+ BIN = ..\\..\\libapps$(LIBEXT)
+else
+ BIN = ../../libapps$(LIBEXT)
+endif
+endif
+
+ROOTDEPPATH = --dep-path .
+
+# Common build
+
+VPATH =
+
+all: .built
+.PHONY: clean depend distclean
+
+$(AOBJS): %$(OBJEXT): %.S
+ $(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+ $(call COMPILE, $<, $@)
+
+.built: $(OBJS)
+ $(call ARCHIVE, $(BIN), $(OBJS))
+ @touch .built
+
+context:
+
+.depend: Makefile $(SRCS)
+ @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+ @touch $@
+
+depend: .depend
+
+clean:
+ $(call DELFILE, .built)
+ $(call CLEAN)
+
+distclean: clean
+ $(call DELFILE, Make.dep)
+ $(call DELFILE, .depend)
+
+-include Make.dep
diff --git a/apps/interpreters/prun/README.txt b/apps/interpreters/prun/README.txt
new file mode 100644
index 000000000..8287d6a6d
--- /dev/null
+++ b/apps/interpreters/prun/README.txt
@@ -0,0 +1,34 @@
+README
+^^^^^^
+
+hello.pas
+
+ This is a sample "Hello, World!" Pascal Program
+
+hello.pex
+
+ This is the compiled, linked P-Code executable that results
+ when hello.pas is compiled.
+
+hello.h
+
+ This file defines an initialized C array holds a copy of
+ hello.pex. This file as created by:
+
+ xxd -i hello.pex >hello.h
+
+mkhello.sh
+
+ This is a scripts that can be used to rebuild both hello.pex
+ and hello.h.
+
+device.c
+
+ The hello.pex file must be provided to the interpreter as a file
+ in the file system. Normally this would be done using real storage
+ medium. In this example, we will use device.c:
+
+ device.c implements a simple device driver. Reads from this device
+ will access the in-memory copy of hello.pex This device driver is
+ registered as /dev/prun in the pseudo filesystem.
+
diff --git a/apps/interpreters/prun/prun.c b/apps/interpreters/prun/prun.c
new file mode 100644
index 000000000..23235074e
--- /dev/null
+++ b/apps/interpreters/prun/prun.c
@@ -0,0 +1,130 @@
+/****************************************************************************
+ * apps/system/prun/prun.c
+ *
+ * Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <apps/interpreters/prun.h>
+
+#include "pexec.h"
+#include "pedefs.h"
+#include "prun.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: prun
+ *
+ * Description:
+ * Execute/interpret a P-Code file. This function does not return until
+ * the P-code program terminates or until a fatal error occurs.
+ *
+ * Input Parameters:
+ * exepath - The full path to the P-Code binary.
+ * varsize - Size of the P-Code variable stack
+ * strsize - the size of the P-Code string stack.
+ *
+ * Returned Value:
+ * OK if the P-Code program successfully terminated; A negated errno value
+ * is returned on the event of any failure.
+ *
+ ****************************************************************************/
+
+int prun(FAR char *exepath, size_t varsize, size_t strsize)
+{
+ FAR struct pexec_s *st;
+ int errcode;
+ int ret = OK;
+
+ /* Load the POFF file into memory */
+
+ st = pload(exepath, varsize, varsize);
+ if (!st)
+ {
+ bdbg("ERROR: Could not load %s\n", exepath);
+ return -ENOEXEC;
+ }
+
+ bvdbg("Loaded %s\n", exepath);
+
+ /* Execute the P-Code program until a stopping condition occurs */
+
+ for (;;)
+ {
+ /* Execute the instruction; Check for exceptional conditions */
+
+ errcode = pexec(st);
+ if (errcode != eNOERROR)
+ {
+ break;
+ }
+ }
+
+ if (errcode != eEXIT)
+ {
+ /* REVISIT: Select a more appropriated return errocode */
+
+ bdbg("ERROR: Runtime error 0x%02x -- Execution Stopped\n", errcode);
+ ret = -ENOEXEC;
+ }
+
+ /* Clean up resources used by the interpreter */
+
+ bvdbg("Execution terminated\n");
+ pexec_release(st);
+ return ret;
+}
diff --git a/apps/interpreters/prun/prun.h b/apps/interpreters/prun/prun.h
new file mode 100644
index 000000000..f9a3b843b
--- /dev/null
+++ b/apps/interpreters/prun/prun.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+ * examples/prun/prun.h
+ *
+ * Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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 __EXAMPLES_PASHELLO_H
+#define __EXAMPLES_PASHELLO_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Defined in device.c */
+
+extern void hello_register(void);
+
+#endif /* __EXAMPLES_PASHELLO_H */
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 5ce7417cb..e635e8f02 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -7314,3 +7314,12 @@
STM32162 Medium+ density parts (plus miscellaneous other improvements to
the original STM32151 logic). From Jussi Kivilinna and Sami Pelkonen
(2014-5-8).
+ * binfmt/binfmt_dumpmodule.c, binfmt_loadmodule.c, binfmt_unloadmdoule.c,
+ builtin.c, elf.c, nxflat.c, pcode.c, and include/nuttx/binfmt/binfmt.h:
+ Extend the binfmt interface to handle error conditions where format-specific
+ binfmt clean-up is needed in the event of error conditions. This is needed
+ by the P-Code binfmt (2014-5-8).
+ * binfmt/libpcode, pcode.c, include/nuttx/poff.h, and binfmt/pcode.h:
+ Now uses apps/interpreters/prun and is basically functional. More work
+ is needed because (1) it is too coupled with apps/ and (2) will not work
+ with CONFIG_NUTTX_KERNEL (2014-5-9). \ No newline at end of file
diff --git a/nuttx/binfmt/Kconfig b/nuttx/binfmt/Kconfig
index 4c99b8b2c..17a42cb5c 100644
--- a/nuttx/binfmt/Kconfig
+++ b/nuttx/binfmt/Kconfig
@@ -66,7 +66,7 @@ endif
config PCODE
bool "Support P-Code Applications"
default n
- depends on INTERPRETERS_PCODE
+ depends on INTERPRETERS_PCODE && INTERPRETERS_PRUN && (!NUTTX_KERNEL || EXPERIMENTAL)
---help---
Enable support for interpreted P-Code binaries. P-Code binaries are
generated by the NuttX Pascal compiler.
diff --git a/nuttx/binfmt/libpcode/Kconfig b/nuttx/binfmt/libpcode/Kconfig
index 03255ffab..b09f6795e 100644
--- a/nuttx/binfmt/libpcode/Kconfig
+++ b/nuttx/binfmt/libpcode/Kconfig
@@ -15,6 +15,20 @@ config PCODE_PRIORITY
---help---
This is the task_priority that will be used when starting P-code interpreter.
+config PCODE_VARSTACKSIZE
+ int "P-code variable stack size"
+ default 1024
+ ---help---
+ This size of the P-Code variable storage area to be allocated by the
+ P-Code runtime.
+
+config PCODE_STRSTACKSIZE
+ int "P-code string stack size"
+ default 128
+ ---help---
+ This size of the P-Code string stack area to be allocated by the
+ P-Code runtime.
+
config PCODE_TEST_FS
bool "Mount a test file system"
depends on FS_ROMFS && !DISABLE_MOUNTPOINT
diff --git a/nuttx/binfmt/libpcode/README.txt b/nuttx/binfmt/libpcode/README.txt
index b7f896da0..7c6ae8ff2 100644
--- a/nuttx/binfmt/libpcode/README.txt
+++ b/nuttx/binfmt/libpcode/README.txt
@@ -49,3 +49,70 @@ Files include in this directory include:
xxd -g 1 -i romfs.img >romfs.h
then cleaned up with an editor to conform with NuttX coding standards.
+
+Test Configuration
+------------------
+Here is a simple test configuration using the NuttX simulator:
+
+1. Install the sim/nsh configuration:
+
+ cd tools
+ ./configure.sh sim/nsh
+ cd ..
+
+2. Install p-code virtual machine as described above.
+
+3. Modify the configuration using 'make menuconfig'. Change the following
+ selections:
+
+ This enables general BINFMT support:
+
+ CONFIG_DEBUG_BINFMT=y
+ CONFIG_BINFMT_EXEPATH=y
+
+ This enables building of the P-Code virtual machine:
+
+ CONFIG_INTERPRETERS_PCODE=y
+
+ This enables building the PCODE binary format
+
+ CONFIG_PCODE=y
+ CONFIG_PCODE_PRIORITY=100
+ CONFIG_PCODE_STACKSIZE=2048
+
+ This enables building and mount a test filesystem:
+
+ CONFIG_PCODE_TEST_FS=y
+ CONFIG_PCODE_TEST_DEVMINOR=3
+ CONFIG_PCODE_TEST_DEVPATH="/dev/ram3"
+ CONFIG_PCODE_TEST_MOUNTPOINT="/bin"
+
+ Debug options can also be enabled with:
+
+ CONFIG_DEBUG=y
+ CONFIG_DEBUG_BINFMT=y
+ CONFIG_DEBUG_VERBOSE=y
+
+4. In lieu of a a real test application, this Quick'n'Dirty patch can be used
+ to initialize the P-Code binary format:
+
+ @@ -115,6 +115,7 @@ const struct symtab_s CONFIG_EXECFUNCS_SYMTAB[1];
+ /****************************************************************************
+ * Name: nsh_main
+ ****************************************************************************/
+ +int pcode_initialize(void);
+
+ int nsh_main(int argc, char *argv[])
+ {
+ @@ -143,6 +144,7 @@ int nsh_main(int argc, char *argv[])
+ exitval = 1;
+ }
+ #endif
+ +(void)pcode_initialize();
+
+ /* Initialize the NSH library */
+
+5. Then after building nuttx.exe you should be able to run the P-Code hello
+ world example like:
+
+ nsh> hello.pex
diff --git a/nuttx/binfmt/pcode.c b/nuttx/binfmt/pcode.c
index 0a187ec81..3c816b212 100644
--- a/nuttx/binfmt/pcode.c
+++ b/nuttx/binfmt/pcode.c
@@ -47,6 +47,8 @@
#include <errno.h>
#include <debug.h>
+#include <apps/interpreters/prun.h>
+
#include <nuttx/kmalloc.h>
#include <nuttx/poff.h>
#include <nuttx/fs/ramdisk.h>
@@ -78,6 +80,14 @@
# error CONFIG_SCHED_ONEXIT is required
#endif
+#ifndef CONFIG_PCODE_VARSTACKSIZE
+# define CONFIG_PCODE_VARSTACKSIZE 1024
+#endif
+
+#ifndef CONFIG_PCODE_STRSTACKSIZE
+# define CONFIG_PCODE_STRSTACKSIZE 128
+#endif
+
#ifdef CONFIG_PCODE_TEST_FS
# ifndef CONFIG_FS_ROMFS
# error You must select CONFIG_FS_ROMFS in your configuration file
@@ -255,19 +265,27 @@ static int pcode_proxy(int argc, char **argv)
if (ret < 0)
{
bdbg("ERROR: on_exit failed: %d\n", errno);
+ kfree(fullpath);
return EXIT_FAILURE;
}
/* Load the P-code file and execute it */
- /* We don't need the fullpath now */
+ ret = prun(fullpath, CONFIG_PCODE_VARSTACKSIZE, CONFIG_PCODE_STRSTACKSIZE);
+
+ /* We no longer need the fullpath */
kfree(fullpath);
- /* Execute the P-code file and execute it */
+ /* Check the result of the interpretation */
+
+ if (ret < 0)
+ {
+ bdbg("ERROR: Execution failed\n");
+ return EXIT_FAILURE;
+ }
- bdbg("ERROR: Not implemented\n");
- return EXIT_FAILURE;
+ return EXIT_SUCCESS;
}
#else
# error Missing logic for the case of CONFIG_NUTTX_KERNEL
diff --git a/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig
index 508e32e38..3cbaa445d 100644
--- a/nuttx/configs/sim/pashello/defconfig
+++ b/nuttx/configs/sim/pashello/defconfig
@@ -449,6 +449,7 @@ CONFIG_EXAMPLES_PASHELLO=y
#
# CONFIG_INTERPRETERS_FICL is not set
CONFIG_INTERPRETERS_PCODE=y
+CONFIG_INTERPRETERS_PRUN=y
#
# Network Utilities
diff --git a/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig
index 06c63a3ea..89497efe7 100644
--- a/nuttx/configs/xtrs/pashello/defconfig
+++ b/nuttx/configs/xtrs/pashello/defconfig
@@ -367,6 +367,7 @@ CONFIG_EXAMPLES_PASHELLO=y
#
# CONFIG_INTERPRETERS_FICL is not set
CONFIG_INTERPRETERS_PCODE=y
+CONFIG_INTERPRETERS_PRUN=y
#
# Network Utilities
diff --git a/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig
index b9a5cc618..644cdf9e1 100644
--- a/nuttx/configs/z16f2800100zcog/pashello/defconfig
+++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig
@@ -404,6 +404,7 @@ CONFIG_EXAMPLES_PASHELLO=y
#
# CONFIG_INTERPRETERS_FICL is not set
CONFIG_INTERPRETERS_PCODE=y
+CONFIG_INTERPRETERS_PRUN=y
#
# Network Utilities
diff --git a/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig
index 7952e0f6f..1b5e1b38f 100644
--- a/nuttx/configs/z80sim/pashello/defconfig
+++ b/nuttx/configs/z80sim/pashello/defconfig
@@ -366,6 +366,7 @@ CONFIG_EXAMPLES_PASHELLO=y
#
# CONFIG_INTERPRETERS_FICL is not set
CONFIG_INTERPRETERS_PCODE=y
+CONFIG_INTERPRETERS_PRUN=y
#
# Network Utilities