From bcc151c414bd3d43db5148738e4d5e841ea144a5 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 9 Mar 2008 14:49:22 +0000
Subject: [PATCH] z8Encore! integrated on simulator
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@727 42af7a65-404d-4744-a932-0658087f49c3
---
TODO | 7 ++++++-
arch/z80/src/common/up_doirq.c | 2 +-
arch/z80/src/z8/z8_restorecontext.S | 7 +++----
configs/z8encore000zco/ostest/defconfig | 12 ++++++++----
.../ostest/{ostest.zfpproj => ostest.zdsproj} | 0
5 files changed, 18 insertions(+), 10 deletions(-)
rename configs/z8encore000zco/ostest/{ostest.zfpproj => ostest.zdsproj} (100%)
diff --git a/TODO b/TODO
index 67bb7943f7..89f4063897 100644
--- a/TODO
+++ b/TODO
@@ -20,7 +20,7 @@ NuttX TODO List (Last updated February 13, 2008)
(1) ARM/DM320 (arch/arm/src/dm320/)
(2) ARM/LPC214x (arch/arm/src/lpc214x/)
(4) pjrc-8052 / MCS51 (arch/pjrc-8051/)
- (5) z80/z8 (arch/z80/)
+ (6) z80/z8 (arch/z80/)
(7) z16 (arch/z16/)
o Task/Scheduler (sched/)
@@ -401,6 +401,11 @@ o z80/z8 (arch/z80)
Status: Open
Priority: Low
+ Description: The z8Encore! port has only been verified on the ZDS-II instruction
+ set simulator.
+ Status: Open
+ Priority: Medium
+
o z16 (arch/z16)
^^^^^^^^^^^^^^^^
diff --git a/arch/z80/src/common/up_doirq.c b/arch/z80/src/common/up_doirq.c
index 951dedc04e..fae0142eba 100644
--- a/arch/z80/src/common/up_doirq.c
+++ b/arch/z80/src/common/up_doirq.c
@@ -96,7 +96,7 @@ FAR chipreg_t *up_doirq(ubyte irq, FAR chipreg_t *regs)
regs = IRQ_STATE();
- /* Indicate that we are no long in interrupt processing logic */
+ /* Indicate that we are no longer in interrupt processing logic */
IRQ_LEAVE(irq);
}
diff --git a/arch/z80/src/z8/z8_restorecontext.S b/arch/z80/src/z8/z8_restorecontext.S
index ef22b10e46..4cdd0d3d0c 100755
--- a/arch/z80/src/z8/z8_restorecontext.S
+++ b/arch/z80/src/z8/z8_restorecontext.S
@@ -97,8 +97,7 @@ _z8_restorecontext:
ldx r7, 3(rr0)
/* Copy all registers into the user register area. NOTE: we
- * should use the saved RP value to determine the destination
- * address
+ * use the saved RP value to determine the destination adress.
*/
clr r0 /* rr0 = destination address */
@@ -130,8 +129,8 @@ _z8_restore:
/* Recover the flags and RP settings.. but don't restore them yet */
- ldx r1, XCPT_FLAGS_OFFS(rr0)
- ldx r2, XCPT_RP_OFFS(rr0)
+ ldx r1, XCPT_FLAGS_OFFS(rr6)
+ ldx r2, XCPT_RP_OFFS(rr6)
/* Determine whether interrupts must be enabled on return. This
* would be nicer to do below, but later we will need to preserve
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index 2b55002953..0725f16ec6 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -310,12 +310,16 @@ CONFIG_NET_BROADCAST=n
CONFIG_NET_DHCP_LIGHT=n
CONFIG_NET_RESOLV_ENTRIES=4
+#
+# Settings for examples/ostest
+CONFIG_OSTEST_STACKSIZE=256
+
#
# Settings for examples/nsh
CONFIG_EXAMPLES_NSH_TELNET=n
CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
+CONFIG_EXAMPLES_NSH_STACKSIZE=512
CONFIG_EXAMPLES_NSH_DHCPC=n
CONFIG_EXAMPLES_NSH_NOMAC=n
CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
@@ -338,8 +342,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
#
CONFIG_BOOT_FROM_FLASH=n
CONFIG_CUSTOM_STACK=n
-CONFIG_PROC_STACK_SIZE=1024
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=1024
+CONFIG_PROC_STACK_SIZE=256
+CONFIG_PTHREAD_STACK_MIN=128
+CONFIG_PTHREAD_STACK_DEFAULT=256
CONFIG_HEAP_SIZE=
CONFIG_HEAP_BASE=
diff --git a/configs/z8encore000zco/ostest/ostest.zfpproj b/configs/z8encore000zco/ostest/ostest.zdsproj
similarity index 100%
rename from configs/z8encore000zco/ostest/ostest.zfpproj
rename to configs/z8encore000zco/ostest/ostest.zdsproj
--
GitLab