Skip to content
Snippets Groups Projects
Commit 758ea38c authored by Gregory Nutt's avatar Gregory Nutt
Browse files

Move P-Code execution logic from interpreters/prun to system/prun

parent 05af9ce2
No related branches found
No related tags found
No related merge requests found
/**************************************************************************** /****************************************************************************
* apps/include/interpreters/prun.h * apps/include/prun.h
* *
* Copyright (C) 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __APPS_INCLUDE_INTERPRETERS_PRUN_H #ifndef __APPS_INCLUDE_PRUN_H
#define __APPS_INCLUDE_INTERPRETERS_PRUN_H #define __APPS_INCLUDE_PRUN_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
...@@ -87,4 +87,4 @@ int prun(FAR char *exepath, size_t varsize, size_t strsize); ...@@ -87,4 +87,4 @@ int prun(FAR char *exepath, size_t varsize, size_t strsize);
} }
#endif #endif
#endif /* __APPS_INCLUDE_INTERPRETERS_PRUN_H */ #endif /* __APPS_INCLUDE_PRUN_H */
...@@ -15,6 +15,4 @@ config INTERPRETERS_PCODE ...@@ -15,6 +15,4 @@ config INTERPRETERS_PCODE
Pascal run-time code. Pascal run-time code.
if INTERPRETERS_PCODE if INTERPRETERS_PCODE
source "$APPSDIR/interpreters/prun/Kconfig"
endif endif
...@@ -38,10 +38,6 @@ ifeq ($(CONFIG_INTERPRETERS_PCODE),y) ...@@ -38,10 +38,6 @@ ifeq ($(CONFIG_INTERPRETERS_PCODE),y)
CONFIGURED_APPS += interpreters/pcode CONFIGURED_APPS += interpreters/pcode
endif endif
ifeq ($(CONFIG_INTERPRETERS_PRUN),y)
CONFIGURED_APPS += interpreters/prun
endif
ifeq ($(CONFIG_INTERPRETERS_FICL),y) ifeq ($(CONFIG_INTERPRETERS_FICL),y)
CONFIGURED_APPS += interpreters/ficl CONFIGURED_APPS += interpreters/ficl
endif endif
...@@ -39,6 +39,10 @@ menu "readline()" ...@@ -39,6 +39,10 @@ menu "readline()"
source "$APPSDIR/system/readline/Kconfig" source "$APPSDIR/system/readline/Kconfig"
endmenu endmenu
menu "P-Code Support"
source "$APPSDIR/system/prun/Kconfig"
endmenu
menu "Power Off" menu "Power Off"
source "$APPSDIR/system/poweroff/Kconfig" source "$APPSDIR/system/poweroff/Kconfig"
endmenu endmenu
......
...@@ -66,6 +66,10 @@ ifeq ($(CONFIG_SYSTEM_NXPLAYER),y) ...@@ -66,6 +66,10 @@ ifeq ($(CONFIG_SYSTEM_NXPLAYER),y)
CONFIGURED_APPS += system/nxplayer CONFIGURED_APPS += system/nxplayer
endif endif
ifeq ($(CONFIG_SYSTEM_PRUN),y)
CONFIGURED_APPS += sysem/prun
endif
ifeq ($(CONFIG_SYSTEM_RAMTEST),y) ifeq ($(CONFIG_SYSTEM_RAMTEST),y)
CONFIGURED_APPS += system/ramtest CONFIGURED_APPS += system/ramtest
endif endif
......
File moved
...@@ -3,12 +3,20 @@ ...@@ -3,12 +3,20 @@
# see misc/tools/kconfig-language.txt. # see misc/tools/kconfig-language.txt.
# #
config INTERPRETERS_PRUN config SYSTEM_PRUN
bool "Pascal P-Code interpreter" bool "Pascal P-Code interpreter"
default n default n
depends on INTERPRETERS_PCODE depends on INTERPRETERS_PCODE
---help--- ---help---
Build the Pascal P-Code interpreter / Virtual machine Build the Pascal P-Code interpreter / Virtual machine
if INTERPRETERS_PRUN if SYSTEM_PRUN
config SYSTEM_PEXEC
bool "Pascal P-Code command"
default n
---help---
Generates an NSH built-in task that may be used to execute P-Code
from the NSH command line.
endif endif
############################################################################ ############################################################################
# apps/interpreters/prun/Makefile # apps/system/prun/Makefile
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
......
File moved
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <apps/interpreters/prun.h> #include <apps/prun.h>
#include "pexec.h" #include "pexec.h"
#include "pedefs.h" #include "pedefs.h"
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment