Integrating z80

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@463 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2007-12-30 18:13:22 +00:00
parent c2f88659b5
commit 772ad744e0
10 changed files with 44 additions and 15 deletions

2
TODO
View File

@ -231,7 +231,7 @@ o Build system
Priority: Low
Description: Dependencies do not work correctly under configs/<board>/src
(same as arch/<arch>/src/board).
(same as arch/<arch>/src/board) with SDCC.
Status: Open
Priority: Medium

View File

@ -51,7 +51,7 @@
/* Z80 Interrupts */
#define Z80_IRQ_SYSTIMER (1)
#define Z80_IRQ_SYSTIMER (0)
#define NR_IRQS (1)
/* IRQ Stack Frame Format

View File

@ -111,15 +111,22 @@ forever:
push af ; Offset 0: I with interrupt state in carry
di
; Call the interrupt decode logic. SP points to the beggining of the reg structure
; Call the interrupt decode logic. SP points to the beggining of the reg structure
ld hl, #0 ; Argument is the beginning of the reg structure
add hl, sp ;
push hl ;
push hl ; Place argument at the top of thest
call _up_decodeirq ; Decode the IRQ
; On return, HL points to the beginning of the reg structure to restore
; Note that (1) the argument pushed on the stack is not popped, and (2) the
; original stack pointer is lost. In the normal case (no context switch),
; HL will contain the value of the SP before the argument was pushed.
ld sp, hl ; Use the new stack pointer
; Restore registers. HL points to the beginning of the reg structure to restore
ld sp, hl ; Use the temp stack pointer
ex af, af' ; Select alternate AF
pop af ; Offset 0: AF' = I with interrupt state in carry
pop bc ; Offset 1: BC

View File

@ -92,13 +92,14 @@ irqstate_t irqsave(void) __naked
void irqrestore(irqstate_t flags) __naked
{
_asm
di ; Assume disabled
pop hl ; HL = return address
pop af ; AF Carry bit hold interrupt state
jr nc, statedisable
ei
ret
statedisable:
di
ret
push af ; Restore stack
push hl ;
ret ; and return
_endasm;
}

View File

@ -45,6 +45,15 @@
* Definitions
************************************************************************************/
/* Bits in the Z80 FLAGS register */
#define Z80_C_FLAG 0x01 /* Bit 0: Carry flag */
#define Z80_N_FLAG 0x02 /* Bit 1: Add/Subtract flag */
#define Z80_PV_FLAG 0x04 /* Bit 2: Parity/Overflow flag */
#define Z80_H_FLAG 0x10 /* Bit 4: Half carry flag */
#define Z80_Z_FLAG 0x40 /* Bit 5: Zero flag */
#define Z80_S_FLAG 0x80 /* Bit 7: Sign flag */
/************************************************************************************
* Public Function Prototypes
************************************************************************************/

View File

@ -285,5 +285,5 @@ CONFIG_CUSTOM_STACK=n
CONFIG_PROC_STACK_SIZE=1024
CONFIG_PTHREAD_STACK_MIN=
CONFIG_PTHREAD_STACK_DEFAULT=
CONFIG_HEAP_SIZE=32768
CONFIG_HEAP_BASE=CONFIG_DRAM_SIZE-CONFIG_HEAP_SIZE
CONFIG_HEAP_SIZE=
CONFIG_HEAP_BASE=

View File

@ -76,10 +76,21 @@ void up_irqinitialize(void)
current_regs = NULL;
/* And finally, enable interrupts */
/* Attach the timer interrupt -- There is not special timer interrupt
* enable in the simulation so it must be enabled here before interrupts
* are enabled.
*
* NOTE: Normally, there are seperate enables for "global" interrupts
* and specific device interrupts. In such a "normal" case, the timer
* interrupt should be attached and enabled in the the function up_timerinit()
*/
irq_attach(Z80_IRQ_SYSTIMER, (xcpt_t)up_timerisr);
/* And finally, enable interrupts (including the timer) */
#ifndef CONFIG_SUPPRESS_INTERRUPTS
irqrestore(TRUE);
irqrestore(Z80_C_FLAG);
#endif
}
@ -93,7 +104,7 @@ void up_irqinitialize(void)
void up_disable_irq(int irq)
{
irqrestore(FALSE);
irqrestore(0);
}
/****************************************************************************

View File

@ -91,5 +91,6 @@ int up_timerisr(int irq, FAR chipreg_t *regs)
void up_timerinit(void)
{
/* The timer interrupt was attached in up_irqinitialize -- see comments there */
}

View File

@ -268,7 +268,7 @@ typedef struct _TCB _TCB;
/* This is the callback type used by sched_foreach() */
typedef void (sched_foreach_t)(FAR _TCB *tcb, FAR void *arg);
typedef void (*sched_foreach_t)(FAR _TCB *tcb, FAR void *arg);
#endif /* __ASSEMBLY__ */

View File

@ -162,7 +162,7 @@ void mm_addregion(FAR void *heapstart, size_t heapsize)
heapend = MM_ALIGN_DOWN((size_t)heapstart + (size_t)heapsize);
heapsize = heapend - heapbase;
mlldbg("Region %d: base=%p size=%d\n", IDX+1, heapstart, heapsize);
mlldbg("Region %d: base=%p size=%u\n", IDX+1, heapstart, heapsize);
/* Add the size of this region to the total size of the heap */