Add acr script

Makefile

@@ -1,14 +1,19 @@
+-include config.mk
+
 CC?=gcc
-VERSION=0.8
+VERSION=0.9
 CCw32?=i486-mingw32-gcc
 CFLAGS+=-O0 -Wall -g
 #CFLAGS+=-DVERSION=\"${VERSION}\"
 PREFIX?=/usr/local
 DESTDIR?=
 
-ARCH=X32
-#ARCH=ARM
-#ARCH=NONE
+# ARCH: X32 X86 8086 ARM M68K
+# ARCH=X32
+# ARCH=X86
+# ARCH=M68K
+# ARCH=ARM
+ARCH=NONE
 
 all: r0 r0d
 
@@ -42,10 +47,13 @@ r0.wasm:
 
 # https://github.com/bebbo/amiga-gcc
 AMICC=/opt/amiga/bin/m68k-amigaos-gcc
-AMICFLAGS=-O0
+AMICFLAGS=-Os -fomit-frame-pointer -msmall-code -m68000
+AMICFLAGS+=-DUSE_DISASM_M68K=1 -DUSE_DISASM=1
 r0.amiga ami:
+	rm -f r0.run
 	$(AMICC) $(AMICFLAGS) -mcrt=nix20 -o r0.run r0.c
 	lha c r0-nix20.lha r0.run
+ami13:
 	rm -f r0.run
 	$(AMICC) $(AMICFLAGS) -DR0_NOENV=1 -DHAVE_FTRUNCATE=0 -mcrt=nix13 -o r0.run r0.c
 	lha c r0-nix13.lha r0.run

cmd.c

@@ -1,22 +1,25 @@
-/* cmd.c - MIT - Copyright 2009-2021 -- pancake /at/ nopcode /dot/ org */
+/* cmd.c - MIT - Copyright 2009-2023 -- pancake /at/ nopcode /dot/ org */
 
 #ifndef HAVE_SYSTEM
 #define HAVE_SYSTEM 1
 #endif
 
-#if USE_DISASM_X86
 #define USE_DISASM 1
+#if USE_DISASM_X86
 #include "dis/x86.c"
 #elif USE_DISASM_X32
-#define USE_DISASM 1
 #include "dis/x32.c"
 #elif USE_DISASM_8086
-#define USE_DISASM 1
 #include "dis/8086.c"
 #elif USE_DISASM_ARM
-#define USE_DISASM 1
 #include "dis/arm.c"
+#elif USE_DISASM_M68K
+// #define M68030 1
+// #define M68020 1
+// #define M68010 1
+#include "dis/m68k.c"
 #else
+#undef USE_DISASM
 #define USE_DISASM 0
 #endif
 
@@ -118,7 +121,6 @@ static int cmd_disasm(const char *arg) {
 #else
 static int cmd_disasm(const char *arg) {
 	return cmd_system("echo X | r0 -n $BLOCK | rasm2 -o $OFFSET -D -"); // |head -n $(($LINES-1))");
-	
 }
 #endif
 

config.mk.acr

@@ -0,0 +1,2 @@
+VERSION=@VERSION@
+PREFIX=@PREFIX@

configure

@@ -0,0 +1,382 @@
+#!/bin/sh
+# This script was automatically generated by ACR v2.1.2
+# @author: pancake <nopcode.org>
+# @url:    http://www.nopcode.org
+# @repo:   git clone https://github.com/radare/acr
+
+[ -z "${AWK}" ] && AWK=awk
+do_remove() {
+if [ "${ACR_RMFILES}" ]; then
+  printf "cleaning temporally files... "
+  rm -f ${ACR_RMFILES}
+  echo "done"
+fi
+}
+control_c() {
+  printf "\n\n^C control-c : script execution interrupted.\n"
+  do_remove
+  exit 1
+}
+trap control_c 2
+split_host() {
+S="$"
+while : ; do
+ENVWORDS="${ENVWORDS} $1_CPU $1_OS"
+STR=`eval "echo ${S}$1"`
+SPLIT_CPU="`echo "$STR" | cut -d - -f 1`"
+SPLIT_OS="`echo "$STR" | $AWK -F - '{
+	if ($2=="unknown"){
+		if (NF<3) { print $2; } else { print $3; }
+	} else {
+		if ($2=="linux") { print $2; } else
+		if (NF<3) { print $2; } else { print $3; }
+	}
+}'`"
+eval "$1_CPU=\"$SPLIT_CPU\""
+eval "$1_OS=\"$SPLIT_OS\""
+shift
+[ -z "$1" ] && break
+done
+}
+
+QUIET=0
+be_quiet() {
+	QUIET=1
+}
+
+VPATH=`dirname ${0}`
+if [ "${VPATH}" = "." ]; then
+	WODIS=current
+else
+	if [ "${VPATH}" = "${PWD}" ]; then
+		VPATH=.
+		WODIS=current
+	else
+		WODIS=crosspath
+		CURDIR=$PWD
+		cd $VPATH
+		VPATH="${PWD}/"
+		cd $CURDIR
+	fi
+fi
+
+guess_os() {
+if [ -e "${VPATH}/config.guess" ]; then
+	sh ${VPATH}/config.guess
+	return
+fi
+CPU="`uname -m|sed -e 's, ,,g'|cut -d - -f 1`"
+OS="`uname -s|tr A-Z a-z`"
+uname -r | grep -qE "(Microsoft|WSL)" 2>/dev/null && OS="wsl"
+GNU="`uname --help 2>&1 | grep gnu`"
+[ "${GNU}" ] && OS="${OS}-gnu"
+[ "${CPU}" = ppc ] && CPU="powerpc"
+echo "${CPU}-unknown-${OS}"
+}
+
+SEARCHPATH="/usr /usr/local /usr/pkg /sw"
+
+: ${PREFIX:=/usr/local}
+CROSSBUILD=0
+BUILD=`guess_os`
+HOST="${BUILD}"
+TARGET="${HOST}"
+ETCDIR="/etc"
+SYSCONFDIR=""
+DESCRIPTION=""
+
+create_environ() {
+: ${EPREFIX:="${PREFIX}"}
+: ${SPREFIX:="${PREFIX}"}
+: ${BINDIR:="${SPREFIX}/bin"}
+: ${SBINDIR:="${PREFIX}/sbin"}
+: ${ETCDIR:="${SPREFIX}/etc"}
+: ${LIBDIR:="${SPREFIX}/lib"}
+: ${PKGCFG_LIBDIR:='${exec_prefix}/lib'}
+: ${PKGCFG_INCDIR:='${prefix}/include'}
+: ${LIBEXECDIR:="${SPREFIX}/libexec"}
+: ${INCLUDEDIR:="${SPREFIX}/include"}
+: ${DATADIR:="${SPREFIX}/share"}
+: ${INFODIR:="${DATADIR}/info"}
+: ${MANDIR:="${DATADIR}/man"}
+: ${DOCDIR:="${DATADIR}/doc/r0"}
+: ${LOCALSTATEDIR:="${SPREFIX}/var"}
+for A in `echo ${PATH} | sed -e 's,:, ,g'` ; do
+  [ -e "$A"/ginstall ] && : ${INSTALL:="$A"/ginstall} && break
+  [ -e "$A"/install ] && : ${INSTALL:="$A"/install} && break
+done
+: ${INSTALL_DIR:=${INSTALL} -d}
+: ${INSTALL_DATA:=${INSTALL} -m 644}
+: ${INSTALL_SCRIPT:=${INSTALL} -m 755}
+: ${INSTALL_PROGRAM:=${INSTALL} -m 755}
+: ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
+: ${INSTALL_MAN:=${INSTALL} -m 444}
+: ${INSTALL_LIB:=${INSTALL} -m 755 -c}
+ PKGNAME='r0' ; VERSION='0.9' ; VERSION_MAJOR=0; VERSION_MINOR=9; VERSION_PATCH=0; VERSION_NUMBER=00900; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
+}
+
+show_usage() {
+cat <<EOF2
+'configure' configures r0-0.9 to adapt to many kinds of systems.
+
+Usage: ./configure [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+  -r, --report            show what libs/programs require to work
+  -q, --quiet             be quiet, less verbose (see ./configure -qV)
+  -V, --version           display version information and exit
+
+Installation directories:
+  --exec-prefix=EPREFIX  install arch-dependent files in EPREFIX [PREFIX]
+  --prefix=PREFIX        install arch-independent files in PREFIX [/usr/local]
+  --sandbox=SPREFIX      sandbox prefix directory: SPREFIX [PREFIX]
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --docdir=DIR           documentation directory [DATADIR/doc/r0]
+  --includedir=DIR       C header files [PREFIX/include]
+  --infodir=DIR          info documentation [DATADIR/info]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --libpath=DIR          set rpath/libname-path to linker
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --mandir=DIR           man documentation [DATADIR/man]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --etcdir=DIR           same as --sysconfdir (/etc)
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+
+System types:
+  --build=BUILD          configure for building on BUILD [guessed]
+  --host=HOST            cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET        configure for building compilers for TARGET [HOST]
+EOF2
+
+printf "
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+"
+printf "
+Report bugs to: pancake <[email protected]>"
+echo ""
+exit 0
+}
+
+take_environ() {
+: ${SH:=/bin/sh}
+: ${CPP:=cpp}
+: ${CC:=gcc}
+: ${PREFIX:=/usr/local/}
+}
+
+ochof() {
+	[ "$QUIET" = 1 ] && return
+	printf "$*"
+}
+
+ocho() {
+	[ "$QUIET" = 1 ] && return
+	echo "$*"
+}
+
+show_version() {
+if [ "$QUIET" = 1 ]; then
+	echo "0.9"
+	exit 0
+fi
+echo "r0-0.9 configuration script done with acr v2.1.2.
+The 'Free Software Foundation' message is only for autodetection.
+Originally written by pancake <nopcode.org>."
+exit 0
+}
+
+parse_options() {
+flag=`echo $1| cut -d = -f 1`
+value=`echo $1| $AWK 'BEGIN{FS="=";}{print $2}'`
+flag2=`echo $flag|cut -f2- -d -| sed -e 's,-,_,g' -e 's,^_,,g'|tr '[a-z]' '[A-Z]'`
+
+if [ "${TARGET_OS}" = "darwin" ]; then
+	LIBPATH=-Wl,-install_name,
+else
+	LIBPATH=-Wl,-R
+fi
+
+case $flag in
+-h|--help|--hel|--h|--he|-help)
+	show_usage ; ;;
+-qV|-quiet-version|--quiet-version)
+	be_quiet
+	show_version ; ;;
+-q|-quiet|--quiet)
+	be_quiet ; ;;
+-V|-version|--version)
+	show_version ; ;;
+-r|--r|--report)
+echo "PKGNAME:     r0"
+echo "VERSION:     0.9"
+echo "AUTHOR:      pancake"
+echo "EMAIL:       [email protected]"
+echo "LANGS:       c"
+	exit 0
+	;;
+--cache-file)
+	# ignored: acr have no cache
+	;;
+--build)
+	BUILD="$value"; split_host BUILD ; ;;
+--host)
+	CROSSBUILD=1 # XXX
+	HOST="$value"; split_host HOST ; ;;
+--target)
+	TARGET="$value"; split_host TARGET ; ;;
+--prefix)
+	PREFIX="$value"; ;;
+--exec-prefix)
+	EPREFIX="$value"; ;;
+--sandbox|--sprefix)
+	SPREFIX="$value"; ;;
+--bindir)
+	BINDIR="$value"; ;;
+--sbindir)
+	SBINDIR="$value"; ;;
+--libexecdir)
+	LIBEXECDIR="$value"; ;;
+--docdir)
+	DOCDIR="$value"; ;;
+--datadir)
+	DATADIR="$value"; ;;
+--sysconfdir)
+	SYSCONFDIR="$value"
+	ETCDIR="$value"; ;;
+--etcdir)
+	SYSCONFDIR="$value"
+	ETCDIR="$value"; ;;
+--sharedstatedir)
+	SHAREDSTATEDIR="$value"; ;;
+--localstatedir)
+	LOCALSTATEDIR="$value"; ;;
+--libdir)
+	LIBDIR="$value"
+	PKGCFG_LIBDIR="$value"; ;;
+--libpath)
+	LDFLAGS="${LDFLAGS} ${LIBPATH}$value"; ;;
+--includedir)
+	PKGCFG_INCDIR="$value"
+	INCLUDEDIR="$value"; CFLAGS="${CFLAGS} -I$value"; ;;
+--infodir)
+	INFODIR="$value"; ;;
+--mandir)
+	MANDIR="$value"; ;;
+
+*) if [ "$value" ]; then eval "`echo $flag2=$value`" ;
+else echo ; echo "WARNING: Unknown flag '$flag'." >&2 ; echo ; fi ;;
+esac
+}
+
+# MAIN #
+take_environ
+split_host BUILD HOST TARGET
+[ -z "$ACRHOOK" ] && ACRHOOK=./configure.hook
+[ -e "$ACRHOOK" ] && . ${ACRHOOK}
+
+while : ; do
+[ -z "$1" ] && break
+parse_options "$1"
+shift
+done
+
+ENVWORDS="MANDIR DESCRIPTION INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR ETCDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGCFG_LIBDIR PKGCFG_INCDIR PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C"
+
+create_environ
+
+ocho "checking build system type... ${BUILD}"
+ocho "checking host system type... ${HOST}"
+ocho "checking target system type... ${TARGET}"
+[ "${CROSSBUILD}" = 1 ] && echo "using crosscompilation mode."
+
+#split_host BUILD HOST TARGET
+[ -n "${prefix}" ] && PREFIX="${prefix}"
+ocho "checking for working directories... ${WODIS}"
+ocho "using prefix '${PREFIX}'"
+ACR_RMFILES=" test.c a.out a.exe"
+
+COMPILER=CC
+ochof "checking for c compiler... "
+HAVE_LANG_C=1
+if [ "${CROSSBUILD}" = 1 ]; then
+ (command -v ${HOST}-${CC} >/dev/null 2>&1)
+ if [ $? = 0 ]; then CC="${HOST}-${CC}"; fi
+fi
+echo "int main(int argc, char **argv){return 0;}" > test.c
+ (exec ${CC} -o a.out ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1)
+if [ $? = 0 ]; then echo ${CC}; else
+ echo no ; HAVE_LANG_C=0
+do_remove
+echo "ERROR: ${CC} cannot create executables" >&2 ;
+exit 1 ; fi
+SEDFLAGS=" -e '"
+COUNT=0
+for A in ${ENVWORDS} ; do
+	[ "${A}" = VPATH ] && continue
+	[ "${A}" = srcdir ] && continue
+	eval "VAR=\$${A}"
+	VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
+	[ $COUNT = 10 ] && COUNT=0 && SEDFLAGS="${SEDFLAGS}' -e '"
+	COUNT=$(($COUNT+1))
+	SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;"
+done
+SEDFLAGS="${SEDFLAGS}'"
+for A in config.mk  ; do # SUBDIRS
+if [ -f "${VPATH}/${A}.acr" ]; then
+  SD_TARGET=${A}
+ else
+  if [ -d "${VPATH}/${A}" ]; then
+   SD_TARGET=${A}/Makefile
+   mkdir -p ${A}
+  else
+   echo "ERROR: Cannot find ${VPATH}/${A}.acr" >&2
+   exit 1
+  fi
+ fi
+ ocho "creating ${SD_TARGET}"
+[ "${VPATH}" != '.' ] &&  mkdir -p $(echo ${A} | sed -e "s,/`basename ${A}`$,,g")
+ cat ${VPATH}/${SD_TARGET}.acr | \
+eval sed -e "s,@VPATH@,${VPATH}/${A},g" ${SEDFLAGS} > ${SD_TARGET}.tmp
+
+for A in ${ENVWORDS}; do
+VALUE=`eval echo "$"${A}`
+if [ "$VALUE" = 0 ]; then ## FALSE
+ MARK="##${A}##"
+if [ -n "`grep \"${MARK}\" ${SD_TARGET}.tmp`" ]; then
+ mv ${SD_TARGET}.tmp ${SD_TARGET}.tmp2
+ cat ${SD_TARGET}.tmp2 | MARK=$MARK $AWK 'BEGIN{a=0;}{if($1==ENVIRON["MARK"]){if(a)a=0;else a=1}else{if(!a)print;}}' > ${SD_TARGET}.tmp
+ fi
+fi
+done
+ mv ${SD_TARGET}.tmp ${SD_TARGET} && rm -f ${SD_TARGET}.tmp2
+ if [ ! $? = 0 ]; then echo Cannot write target file ; control_c ; fi
+done
+
+do_remove
+if [ "$QUIET" = 0 ]; then
+echo
+echo "Final report:"
+for A in  VERSION PREFIX ; do
+eval VAL="\$${A}"
+[ -z "${VAL}" ] && VAL="\"\""
+echo " - ${A} = ${VAL}"
+done
+fi

configure.acr

@@ -0,0 +1,10 @@
+PKGNAME r0
+VERSION 0.9
+CONTACT pancake ; [email protected]
+
+LANG_C!
+
+SUBDIRS config.mk ;
+
+REPORT VERSION PREFIX ;
+

r0.h

@@ -1,4 +1,4 @@
-#define VERSION "0.8"
+#define VERSION "0.9"
 
 #include <unistd.h>
 #include <sys/types.h>