diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-03-09 14:49:22 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-03-09 14:49:22 +0000 |
| commit | 60dce7a45a4b04e92d40388f215dc976f89247a9 (patch) | |
| tree | 1a649adfc24cc6817f7caf9c9f34d12924c2998a /nuttx/arch/z80 | |
| parent | 99e869802e5b69c659946feb2467dd7bca0f415f (diff) | |
| download | px4-nuttx-60dce7a45a4b04e92d40388f215dc976f89247a9.tar.gz px4-nuttx-60dce7a45a4b04e92d40388f215dc976f89247a9.tar.bz2 px4-nuttx-60dce7a45a4b04e92d40388f215dc976f89247a9.zip | |
z8Encore! integrated on simulator
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@727 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/z80')
| -rw-r--r-- | nuttx/arch/z80/src/common/up_doirq.c | 2 | ||||
| -rwxr-xr-x | nuttx/arch/z80/src/z8/z8_restorecontext.S | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/nuttx/arch/z80/src/common/up_doirq.c b/nuttx/arch/z80/src/common/up_doirq.c index 951dedc04..fae0142eb 100644 --- a/nuttx/arch/z80/src/common/up_doirq.c +++ b/nuttx/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/nuttx/arch/z80/src/z8/z8_restorecontext.S b/nuttx/arch/z80/src/z8/z8_restorecontext.S index ef22b10e4..4cdd0d3d0 100755 --- a/nuttx/arch/z80/src/z8/z8_restorecontext.S +++ b/nuttx/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
|