From 63fe547b8bcc7bbd4597039fd91aab240e32366e Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 5 Jan 2008 19:07:01 +0000 Subject: NuttX runtime install git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@512 42af7a65-404d-4744-a932-0658087f49c3 --- misc/pascal/ChangeLog | 3 +++ misc/pascal/insn16/prun/Make.defs | 4 +-- misc/pascal/libpas/Make.defs | 48 ++++++++++++++++++++++++++++++++++++ misc/pascal/libpoff/Make.defs | 1 - misc/pascal/nuttx/INSTALL.sh | 51 ++++++++++++++++++++++++++++----------- misc/pascal/nuttx/Makefile | 18 ++++++-------- 6 files changed, 97 insertions(+), 28 deletions(-) create mode 100644 misc/pascal/ChangeLog create mode 100644 misc/pascal/libpas/Make.defs (limited to 'misc/pascal') diff --git a/misc/pascal/ChangeLog b/misc/pascal/ChangeLog new file mode 100644 index 000000000..5b895fa1e --- /dev/null +++ b/misc/pascal/ChangeLog @@ -0,0 +1,3 @@ +P0.1.0 2008-01-07 Gregory Nutt + + * Initial release diff --git a/misc/pascal/insn16/prun/Make.defs b/misc/pascal/insn16/prun/Make.defs index 234e5e139..69fdc2c56 100644 --- a/misc/pascal/insn16/prun/Make.defs +++ b/misc/pascal/insn16/prun/Make.defs @@ -34,5 +34,5 @@ # ############################################################################ -INSN_ASRCS = -INSN_CSRCS = pload.c pexec.c +PRUN_ASRCS = +PRUN_CSRCS = pload.c pexec.c diff --git a/misc/pascal/libpas/Make.defs b/misc/pascal/libpas/Make.defs new file mode 100644 index 000000000..8ffcd4d62 --- /dev/null +++ b/misc/pascal/libpas/Make.defs @@ -0,0 +1,48 @@ +############################################################################ +# libpoff/Make.defs +# NuttX runtime makefile fragment +# +# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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. +# +############################################################################ + +POFF_ASRCS = +POFF_CSRCS = pfhandle.c pfproghandle.c pftprog.c \ + pfsymhandle.c pftsymbol.c pofferr.c \ + pfwhdr.c pfwrodata.c pfwsymbol.c pfwfname.c \ + pfwprog.c pfwlineno.c pfwdbgfunc.c pfwreloc.c pfwstring.c \ + pfwrite.c pfrhdr.c pfrsymbol.c pfrfname.c \ + pfrprog.c pfrlineno.c pfrdbgfunc.c pfrrawlineno.c \ + pfrrawreloc.c pfrstring.c pfread.c pfrseek.c \ + pfrelease.c pfdbgcontainer.c pfdbgdiscard.c \ + pfxprog.c pfxrodata.c pfiprog.c pfirodata.c \ + pfdhdr.c pfdsymbol.c pfdreloc.c pflabel.c \ + pflineno.c pfdbginfo.c diff --git a/misc/pascal/libpoff/Make.defs b/misc/pascal/libpoff/Make.defs index 68ed47e4e..8ffcd4d62 100644 --- a/misc/pascal/libpoff/Make.defs +++ b/misc/pascal/libpoff/Make.defs @@ -46,4 +46,3 @@ POFF_CSRCS = pfhandle.c pfproghandle.c pftprog.c \ pfxprog.c pfxrodata.c pfiprog.c pfirodata.c \ pfdhdr.c pfdsymbol.c pfdreloc.c pflabel.c \ pflineno.c pfdbginfo.c -L \ No newline at end of file diff --git a/misc/pascal/nuttx/INSTALL.sh b/misc/pascal/nuttx/INSTALL.sh index 71509827f..53749281f 100755 --- a/misc/pascal/nuttx/INSTALL.sh +++ b/misc/pascal/nuttx/INSTALL.sh @@ -112,13 +112,36 @@ mkdir ${nuttxdir}/pcode/include || \ mkdir ${nuttxdir}/pcode/insn || \ { echo "mkdir ${nuttxdir}/pcode/insn failed" ; exit 1 ; } -# Copy runtime files +mkdir ${nuttxdir}/pcode/insn/include || \ + { echo "mkdir ${nuttxdir}/pcode/insn/include failed" ; exit 1 ; } + +mkdir ${nuttxdir}/pcode/insn/prun || \ + { echo "mkdir ${nuttxdir}/pcode/insn/prun failed" ; exit 1 ; } -cp -a ${pascaldir}/include/poff.h ${nuttxdir}/pcode/include/. || \ - { echo "Failed to copy ${pascaldir}/include/poff.h" ; exit 1; } +mkdir ${nuttxdir}/pcode/libpoff || \ + { echo "mkdir ${nuttxdir}/pcode/libpoff failed" ; exit 1 ; } -cp -a ${pascaldir}/include/pofflib.h ${nuttxdir}/pcode/include/. || \ - { echo "Failed to copy ${pascaldir}/include/poff.h" ; exit 1; } +mkdir ${nuttxdir}/pcode/libpas || \ + { echo "mkdir ${nuttxdir}/pcode/libpas failed" ; exit 1 ; } + +# Copy runtime files + +cp -a ${pascaldir}/include/poff.h ${pascaldir}/include/pofflib.h \ + ${pascaldir}/include/pedefs.h ${pascaldir}/include/perr.h \ + ${pascaldir}/include/pdefs.h ${pascaldir}/include/pfdefs.h \ + ${pascaldir}/include/pxdefs.h ${pascaldir}/include/paslib.h \ + ${nuttxdir}/pcode/include/. || \ + { echo "Failed to copy ${pascaldir}/include" ; exit 1; } + +echo "#ifndef __CONFIG_H" >${nuttxdir}/pcode/include/config.h +echo "#define __CONFIG_H 1" >>${nuttxdir}/pcode/include/config.h +echo "" >>${nuttxdir}/pcode/include/config.h +echo "#undef CONFIG_DEBUG" >>${nuttxdir}/pcode/include/config.h +echo "#undef CONFIG_TRACE" >>${nuttxdir}/pcode/include/config.h +echo "#define CONFIG_INSN16 1" >>${nuttxdir}/pcode/include/config.h +echo "#undef CONFIG_INSN32" >>${nuttxdir}/pcode/include/config.h +echo "" >>${nuttxdir}/pcode/include/config.h +echo "#endif /* __CONFIG_H */" >>${nuttxdir}/pcode/include/config.h cp -a ${pascaldir}/nuttx/Makefile ${nuttxdir}/pcode/. || \ { echo "Failed to copy ${pascaldir}/nuttx/Makefile" ; exit 1; } @@ -126,18 +149,18 @@ cp -a ${pascaldir}/nuttx/Makefile ${nuttxdir}/pcode/. || \ cp -a ${pascaldir}/nuttx/keywords.h ${nuttxdir}/pcode/include/. || \ { echo "Failed to copy ${pascaldir}/nuttx/keywords.h" ; exit 1; } -cp -a ${pascaldir}/libpoff ${nuttxdir}/pcode/. || \ +cp -a ${pascaldir}/libpoff/*.c ${pascaldir}/libpoff/*.h \ + ${pascaldir}/libpoff/Make.defs ${nuttxdir}/pcode/libpoff/. || \ { echo "Failed to copy ${pascaldir}/libpoff" ; exit 1; } -rm -f ${nuttxdir}/pcode/libpoff/Makefile || \ - { echo "Failed to remove ${nuttxdir}/pcode/libpoff/Makefile" ; exit 1; } +cp -a ${pascaldir}/libpas/psignextend16.c ${pascaldir}/libpas/Make.defs \ + ${nuttxdir}/pcode/libpas/. || \ + { echo "Failed to copy ${pascaldir}/libpas" ; exit 1; } -cp -a ${pascaldir}/${modeldir}/include ${nuttxdir}/pcode/insn/. || \ +cp -a ${pascaldir}/${modeldir}/include/pexec.h ${pascaldir}/${modeldir}/include/pinsn16.h \ + ${nuttxdir}/pcode/insn/include/. || \ { echo "Failed to copy ${pascaldir}/${modeldir}/include" ; exit 1; } -cp -a ${pascaldir}/${modeldir}/prun ${nuttxdir}/pcode/insn/. || \ +cp -a ${pascaldir}/${modeldir}/prun/pexec.c ${pascaldir}/${modeldir}/prun/pload.c \ + ${pascaldir}/${modeldir}/prun/Make.defs ${nuttxdir}/pcode/insn/prun/. || \ { echo "Failed to copy ${pascaldir}/${modeldir}/prun" ; exit 1; } - -rm -f ${nuttxdir}/pcode/insn/Makefile || \ - { echo "Failed to remove ${nuttxdir}/pcode/insn/Makefile" ; exit 1; } - diff --git a/misc/pascal/nuttx/Makefile b/misc/pascal/nuttx/Makefile index 055e719c6..96a6d5b50 100644 --- a/misc/pascal/nuttx/Makefile +++ b/misc/pascal/nuttx/Makefile @@ -38,15 +38,14 @@ MKDEP = $(TOPDIR)/tools/mkdeps.sh CFLAGS += -Iinclude -Iinsn/include -ifeq ($(CONFIG_NET),y) -include insn/Make.defs +include insn/prun/Make.defs include libpoff/Make.defs -endif +include libpas/Make.defs -ASRCS = $(INSN_ASRCS) $(POFF_ASRCS) +ASRCS = $(PRUN_ASRCS) $(POFF_ASRCS) $(PAS_ASRCS) AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = $(INSN_CSRCS) $(POFF_CSRCS) +CSRCS = $(PRUN_CSRCS) $(POFF_CSRCS) $(PAS_CSRCS) COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) @@ -54,7 +53,7 @@ OBJS = $(AOBJS) $(COBJS) BIN = libpcode$(LIBEXT) -VPATH = insn:libpoff +VPATH = insn/prun:libpoff all: $(BIN) @@ -71,11 +70,8 @@ $(BIN): $(OBJS) done ; ) .depend: Makefile $(SRCS) -ifeq ($(CONFIG_NET),y) - $(MKDEP) --dep-path . --dep-path insn --dep-path liboff $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -else - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif + $(MKDEP) --dep-path . --dep-path insn/prun --dep-path libpoff --dep-path libpas \ + $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep touch $@ depend: .depend -- cgit v1.2.3