OpenBIOS November 2010

openbios@openbios.org

10 participants
59 discussions

[commit] r967 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 22 Nov '10

22 Nov '10

Author: afaerber Date: Mon Nov 22 21:00:13 2010 New Revision: 967 URL: http://tracker.coreboot.org/trac/openbios/changeset/967 Log: ppc: SDR1 fixes Clean up use of SDR1 fields. IBM's "The Programming Environments for 32-Bit Microprocessors": The HTABMASK field in SDR1 contains a mask value that determines how many bits from the hash are used in the page table index. This mask must be of the form 0b00...011...1; that is, a string of 0 bits followed by a string of 1bits. The 1 bits determine how many additional bits (at least 10) from the hash are used in the index; HTABORG must have this same number of low-order bits equal to 0. IBM's "The Programming Environments Manual for 64-bit Microprocessors" 3.0: The HTABSIZE field in SDR1 contains an integer value that determines how many bits from the hash are used in the page table index. This number must not exceed 28. HTABSIZE is used to generate a mask of the form 0b00...011...1; that is, a string of 0 bits followed by a string of 1-bits. The 1-bits determine how many additional bits (beyond the minimum of 11) from the hash are used in the index. The HTABORG must have this same number of low-order bits equal to 0. Adjust alignment mask and hash size for ppc64. Note that the page table does not yet scale with the memory size, and the secondary hash is not yet used. v5: * Move HTABORG mask to header. * Keep is_ppc64() for now, suggested by Alex. Merge CONFIG_PPC_64BITSUPPORT handling here so that it behaves as intended, not recognizing a ppc64 CPU in pure 32-bit mode. * Stub out hash_page_32() for ppc64 to avoid having to care about it for ppc64. hash_page_64() is less critical for pure ppc build since the code needs to be 32-bit compatible anyway. v4: * Don't redefine hash_page_{32,64} but add TODO comments for renaming. * Keep and simplify hash_page(). v3: * Fix shifts. Thanks to Segher and Alex. * Fix HTABSIZE for 32-bit ppc64: ((2 << 15) - 1) >> 16 happened to be 0, so that it worked as expected. Avoid underflow, spotted by Alex. Make this fix available for legacy 64-bit support as well. * Drop get_hash_size(). It was only used in hash_page_32() and caused unnecessary conversions between HTABMASK and size. * Introduce {mfsdr1,mtsdr1} as suggested by Alex. Note that this changes the volatility for hash_page_64(). * Conditionalize 64-bit support, drop 32-bit support for ppc64. * Adjust hash size for ppc64. v2: * Use HTABSIZE for ppc64, fix HTABMASK usage for ppc. Error spotted by Segher. Cc: Segher Boessenkool <segher(a)kernel.crashing.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/include/arch/ppc/processor.h Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 21 22:53:54 2010 (r966) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon Nov 22 21:00:13 2010 (r967) @@ -48,7 +48,12 @@ #define OF_CODE_START 0xfff00000UL #define IO_BASE 0x80000000 -#define HASH_SIZE (2 << 15) +#ifdef __powerpc64__ +#define HASH_BITS 18 +#else +#define HASH_BITS 15 +#endif +#define HASH_SIZE (2 << HASH_BITS) #define OFMEM_SIZE (2 * 1024 * 1024) #define SEGR_USER BIT(2) @@ -57,21 +62,7 @@ static inline unsigned long get_hash_base( void ) { - unsigned long sdr1; - - asm volatile("mfsdr1 %0" : "=r" (sdr1) ); - - return (sdr1 & 0xffff0000); -} - -static inline unsigned long -get_hash_size( void ) -{ - unsigned long sdr1; - - asm volatile("mfsdr1 %0" : "=r" (sdr1) ); - - return ((sdr1 << 16) | 0x0000ffff) + 1; + return (mfsdr1() & SDR1_HTABORG_MASK); } static inline unsigned long @@ -242,7 +233,7 @@ vsid = (ea >> 28) + SEGR_BASE; vsid_sh = 7; vsid_mask = 0x00003FFFFFFFFF80ULL; - asm ( "mfsdr1 %0" : "=r" (sdr) ); + sdr = mfsdr1(); sdr_sh = 18; sdr_mask = 0x3FF80; page_mask = 0x0FFFFFFF; // XXX correct? @@ -297,6 +288,7 @@ static void hash_page_32( ucell ea, ucell phys, ucell mode ) { +#ifndef __powerpc64__ static int next_grab_slot=0; unsigned long *upte, cmp, hash1; int i, vsid, found; @@ -307,7 +299,7 @@ hash1 = vsid; hash1 ^= (ea >> 12) & 0xffff; - hash1 &= (get_hash_size() - 1) >> 6; + hash1 &= (((mfsdr1() & 0x1ff) << 16) | 0xffff) >> 6; pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); upte = (unsigned long*)pp; @@ -332,14 +324,22 @@ upte[i*2+1] = (phys & ~0xfff) | mode; asm volatile( "tlbie %0" :: "r"(ea) ); +#endif } static int is_ppc64(void) { +#ifdef __powerpc64__ + return 1; +#elif defined(CONFIG_PPC_64BITSUPPORT) unsigned int pvr = mfpvr(); return ((pvr >= 0x330000) && (pvr < 0x70330000)); +#else + return 0; +#endif } +/* XXX Remove these ugly constructs when legacy 64-bit support is dropped. */ static void hash_page( unsigned long ea, unsigned long phys, ucell mode ) { if ( is_ppc64() ) @@ -385,20 +385,21 @@ setup_mmu( unsigned long ramsize ) { ofmem_t *ofmem; - unsigned long sdr1; #ifndef __powerpc64__ unsigned long sr_base; #endif unsigned long hash_base; - unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */ + unsigned long hash_mask = ~0x000fffffUL; /* alignment for ppc64 */ int i; /* SDR1: Storage Description Register 1 */ hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; memset((void *)hash_base, 0, HASH_SIZE); - sdr1 = hash_base | ((HASH_SIZE-1) >> 16); - asm volatile("mtsdr1 %0" :: "r" (sdr1) ); + if (is_ppc64()) + mtsdr1(hash_base | MAX(HASH_BITS - 18, 0)); + else + mtsdr1(hash_base | ((HASH_SIZE - 1) >> 16)); #ifdef __powerpc64__ Modified: trunk/openbios-devel/include/arch/ppc/processor.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/processor.h Sun Nov 21 22:53:54 2010 (r966) +++ trunk/openbios-devel/include/arch/ppc/processor.h Mon Nov 22 21:00:13 2010 (r967) @@ -425,6 +425,24 @@ #endif } +#ifdef __powerpc64__ +#define SDR1_HTABORG_MASK 0x3FFFFFFFFFFC0000UL +#else +#define SDR1_HTABORG_MASK 0xffff0000 +#endif + +static inline unsigned long mfsdr1(void) +{ + unsigned long sdr1; + asm volatile("mfsdr1 %0" : "=r" (sdr1)); + return sdr1; +} + +static inline void mtsdr1(unsigned long sdr1) +{ + asm volatile("mtsdr1 %0" :: "r" (sdr1)); +} + static inline unsigned int mfpvr(void) { unsigned int pvr;

1 0

[commit] r966 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 21 Nov '10

21 Nov '10

Author: afaerber Date: Sun Nov 21 22:53:54 2010 New Revision: 966 URL: http://tracker.coreboot.org/trac/openbios/changeset/966 Log: ppc: Set up SLBs for ppc64 Set up SLBs with slbmte instead of mtsrin, suggested by Alex. v3: * Continue to use mtmsrin on ppc for simplicity. * Add comment on slbia, suggested by Segher. * Add inline functions {slbia,slbmte}, requested by Alex. * Add inline function mfpvr before Alex asks for it. :) v2: * Don't initialize 64 SLBs, then invalidate them, as in IBM's application note for the 970. Use slbia instead, recommended by Alex. * Conditionalize when to use SLB or SR. Cc: Segher Boessenkool <segher(a)kernel.crashing.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/include/arch/ppc/processor.h Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 21 20:20:54 2010 (r965) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 21 22:53:54 2010 (r966) @@ -336,9 +336,7 @@ static int is_ppc64(void) { - unsigned int pvr; - asm volatile("mfspr %0, 0x11f" : "=r" (pvr) ); - + unsigned int pvr = mfpvr(); return ((pvr >= 0x330000) && (pvr < 0x70330000)); } @@ -387,7 +385,10 @@ setup_mmu( unsigned long ramsize ) { ofmem_t *ofmem; - unsigned long sdr1, sr_base; + unsigned long sdr1; +#ifndef __powerpc64__ + unsigned long sr_base; +#endif unsigned long hash_base; unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */ int i; @@ -399,6 +400,19 @@ sdr1 = hash_base | ((HASH_SIZE-1) >> 16); asm volatile("mtsdr1 %0" :: "r" (sdr1) ); +#ifdef __powerpc64__ + + /* Segment Lookaside Buffer */ + + slbia(); /* Invalidate all SLBs except SLB 0 */ + for (i = 0; i < 16; i++) { + unsigned long rs = ((0x400 + i) << 12) | (0x10 << 7); + unsigned long rb = ((unsigned long)i << 28) | (1 << 27) | i; + slbmte(rs, rb); + } + +#else + /* Segment Register */ sr_base = SEGR_USER | SEGR_BASE ; @@ -407,6 +421,8 @@ asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); } +#endif + ofmem = ofmem_arch_get_private(); memset(ofmem, 0, sizeof(ofmem_t)); ofmem->ramsize = ramsize; Modified: trunk/openbios-devel/include/arch/ppc/processor.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/processor.h Sun Nov 21 20:20:54 2010 (r965) +++ trunk/openbios-devel/include/arch/ppc/processor.h Sun Nov 21 22:53:54 2010 (r966) @@ -425,6 +425,23 @@ #endif } +static inline unsigned int mfpvr(void) +{ + unsigned int pvr; + asm volatile("mfspr %0, 0x11f" : "=r" (pvr) ); + return pvr; +} + +static inline void slbia(void) +{ + asm volatile("slbia" ::: "memory"); +} + +static inline void slbmte(unsigned long rs, unsigned long rb) +{ + asm volatile("slbmte %0,%1 ; isync" :: "r" (rs), "r" (rb) : "memory"); +} + #endif /* !__ASSEMBLER__ */ #endif /* _H_PROCESSOR */

1 0

[PATCH] ppc: Move noreturn attribute
by Andreas Färber 21 Nov '10

21 Nov '10

Otherwise GCC 4.2.4 complains that panic() marked noreturn does return. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/kernel.h | 2 +- arch/ppc/qemu/qemu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/kernel.h b/arch/ppc/qemu/kernel.h index e8ae364..fe9be83 100644 --- a/arch/ppc/qemu/kernel.h +++ b/arch/ppc/qemu/kernel.h @@ -17,7 +17,7 @@ /* misc.c */ extern void fatal_error( const char *str ); -extern void exit( int status ); +extern void exit( int status ) __attribute__ ((noreturn)); /* start.S */ extern void flush_icache_range( char *start, char *stop ); diff --git a/arch/ppc/qemu/qemu.c b/arch/ppc/qemu/qemu.c index 1f785ac..208669c 100644 --- a/arch/ppc/qemu/qemu.c +++ b/arch/ppc/qemu/qemu.c @@ -35,7 +35,7 @@ void exit( int status __attribute__ ((unused))) { for (;;); -} __attribute__ ((noreturn)) +} void fatal_error( const char *err ) -- 1.7.3

4 66

[commit] r965 - trunk/openbios-devel/include/arch/ppc
by repository service 21 Nov '10

21 Nov '10

Author: afaerber Date: Sun Nov 21 20:20:54 2010 New Revision: 965 URL: http://tracker.coreboot.org/trac/openbios/changeset/965 Log: ppc: Convert I/O macros to inline functions Suggested by Blue. Clean up function signatures while at it. v4: * Convert all I/O functions to use POSIX types for value. Suggested by Alex. v3: * Split off isa_io_base changes. v2: * Make port uint16_t, suggested by Alex. * Adapt isa_io_base for ppc64. Cc: Blue Swirl <blauwirbel(a)gmail.com> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/include/arch/ppc/io.h Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sun Nov 21 14:32:37 2010 (r964) +++ trunk/openbios-devel/include/arch/ppc/io.h Sun Nov 21 20:20:54 2010 (r965) @@ -17,89 +17,73 @@ extern unsigned long isa_io_base; /* - * The insw/outsw/insl/outsl macros don't do byte-swapping. - * They are only used in practice for transferring buffers which - * are arrays of bytes, and byte-swapping is not appropriate in - * that case. - paulus - */ -#define insw(port, buf, ns) _insw((uint16_t *)(uintptr_t)((port)+isa_io_base), (buf), (ns)) -#define outsw(port, buf, ns) _outsw((uint16_t *)(uintptr_t)((port)+isa_io_base), (buf), (ns)) - -#define inb(port) in_8((uint8_t *)(uintptr_t)((port)+isa_io_base)) -#define outb(val, port) out_8((uint8_t *)(uintptr_t)((port)+isa_io_base), (val)) -#define inw(port) in_le16((uint16_t *)(uintptr_t)((port)+isa_io_base)) -#define outw(val, port) out_le16((uint16_t *)(uintptr_t)((port)+isa_io_base), (val)) -#define inl(port) in_le32((uint32_t *)(uintptr_t)((port)+isa_io_base)) -#define outl(val, port) out_le32((uint32_t *)(uintptr_t)((port)+isa_io_base), (val)) - -/* * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. */ -static inline int in_8(volatile unsigned char *addr) +static inline uint8_t in_8(volatile uint8_t *addr) { - int ret; + uint8_t ret; __asm__ __volatile__("lbz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr)); return ret; } -static inline void out_8(volatile unsigned char *addr, int val) +static inline void out_8(volatile uint8_t *addr, uint8_t val) { __asm__ __volatile__("stb%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val)); } -static inline int in_le16(volatile unsigned short *addr) +static inline uint16_t in_le16(volatile uint16_t *addr) { - int ret; + uint16_t ret; __asm__ __volatile__("lhbrx %0,0,%1; eieio":"=r"(ret): "r"(addr), "m"(*addr)); return ret; } -static inline int in_be16(volatile unsigned short *addr) +static inline uint16_t in_be16(volatile uint16_t *addr) { - int ret; + uint16_t ret; __asm__ __volatile__("lhz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr)); return ret; } -static inline void out_le16(volatile unsigned short *addr, int val) +static inline void out_le16(volatile uint16_t *addr, uint16_t val) { __asm__ __volatile__("sthbrx %1,0,%2; eieio":"=m"(*addr):"r"(val), "r"(addr)); } -static inline void out_be16(volatile unsigned short *addr, int val) +static inline void out_be16(volatile uint16_t *addr, uint16_t val) { __asm__ __volatile__("sth%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val)); } -static inline unsigned in_le32(volatile unsigned *addr) +static inline uint32_t in_le32(volatile uint32_t *addr) { - unsigned ret; + uint32_t ret; __asm__ __volatile__("lwbrx %0,0,%1; eieio":"=r"(ret): "r"(addr), "m"(*addr)); return ret; } -static inline unsigned in_be32(volatile unsigned *addr) +static inline uint32_t in_be32(volatile uint32_t *addr) { - unsigned ret; + uint32_t ret; __asm__ __volatile__("lwz%U1%X1 %0,%1; eieio":"=r"(ret):"m"(*addr)); return ret; } -static inline void out_le32(volatile unsigned *addr, int val) +static inline void out_le32(volatile uint32_t *addr, uint32_t val) { __asm__ __volatile__("stwbrx %1,0,%2; eieio":"=m"(*addr):"r"(val), "r"(addr)); } -static inline void out_be32(volatile unsigned *addr, int val) +static inline void out_be32(volatile unsigned *addr, uint32_t val) { __asm__ __volatile__("stw%U0%X0 %1,%0; eieio":"=m"(*addr):"r"(val)); } @@ -145,6 +129,56 @@ ns--; } } + + +/* + * The insw/outsw/insl/outsl functions don't do byte-swapping. + * They are only used in practice for transferring buffers which + * are arrays of bytes, and byte-swapping is not appropriate in + * that case. - paulus + */ + +static inline void insw(uint16_t port, void *buf, int ns) +{ + _insw((uint16_t *)(port + isa_io_base), buf, ns); +} + +static inline void outsw(uint16_t port, void *buf, int ns) +{ + _outsw((uint16_t *)(port + isa_io_base), buf, ns); +} + + +static inline uint8_t inb(uint16_t port) +{ + return in_8((uint8_t *)(port + isa_io_base)); +} + +static inline void outb(uint8_t val, uint16_t port) +{ + out_8((uint8_t *)(port + isa_io_base), val); +} + +static inline uint16_t inw(uint16_t port) +{ + return in_le16((uint16_t *)(port + isa_io_base)); +} + +static inline void outw(uint16_t val, uint16_t port) +{ + out_le16((uint16_t *)(port + isa_io_base), val); +} + +static inline uint32_t inl(uint16_t port) +{ + return in_le32((uint32_t *)(port + isa_io_base)); +} + +static inline void outl(uint32_t val, uint16_t port) +{ + out_le32((uint32_t *)(port + isa_io_base), val); +} + #else /* BOOTSTRAP */ #ifdef FCOMPILER #define inb(reg) ((u8)0xff)

1 0

[commit] r964 - in trunk/openbios-devel: arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/unix include/arch/ppc
by repository service 21 Nov '10

21 Nov '10

Author: afaerber Date: Sun Nov 21 14:32:37 2010 New Revision: 964 URL: http://tracker.coreboot.org/trac/openbios/changeset/964 Log: ppc: Adjust isa_io_base for ppc64 To avoid cast warnings, use a 64-bit ISA I/O base on ppc64. v3: * Adjust unix target, pointed out by Blue. Unify ppc and sparc64, using unsigned long instead of uintptr_t. It is initialized from pci_arch_t, which uses unsigned long. * Update other ppc targets, pointed out by Blue. v2: Initial. Cc: Blue Swirl <blauwirbel(a)gmail.com> Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/include/arch/ppc/io.h Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Nov 21 14:32:37 2010 (r964) @@ -53,7 +53,7 @@ ; } -uint32_t isa_io_base; +unsigned long isa_io_base; void entry( void ) Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Nov 21 14:32:37 2010 (r964) @@ -49,7 +49,7 @@ ; } -uint32_t isa_io_base; +unsigned long isa_io_base; void entry( void ) Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Nov 21 14:32:37 2010 (r964) @@ -56,7 +56,7 @@ ; } -uint32_t isa_io_base; +unsigned long isa_io_base; void entry( void ) Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 21 14:32:37 2010 (r964) @@ -152,7 +152,7 @@ .irqs = { 21, 22, 23, 24 } }, }; -uint32_t isa_io_base; +unsigned long isa_io_base; void entry( void ) Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/arch/unix/unix.c Sun Nov 21 14:32:37 2010 (r964) @@ -63,9 +63,7 @@ static int segfault = 0; static int verbose = 0; -#ifdef CONFIG_PPC -uint32_t isa_io_base; -#elif defined(CONFIG_SPARC64) +#if defined(CONFIG_PPC) || defined(CONFIG_SPARC64) unsigned long isa_io_base; #endif Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sun Nov 21 11:36:35 2010 (r963) +++ trunk/openbios-devel/include/arch/ppc/io.h Sun Nov 21 14:32:37 2010 (r964) @@ -14,7 +14,7 @@ #ifndef BOOTSTRAP -extern uint32_t isa_io_base; +extern unsigned long isa_io_base; /* * The insw/outsw/insl/outsl macros don't do byte-swapping.

1 0

[PATCH] ppc: Use mtmsrd on ppc64
by Andreas Färber 21 Nov '10

21 Nov '10

Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/ofmem.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index 9c60841..e8b0b24 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -25,6 +25,12 @@ #define BIT(n) (1U<<(31-(n))) +#ifdef __powerpc64__ +#define MTMSR "mtmsrd" +#else +#define MTMSR "mtmsr" +#endif + /* called from assembly */ extern void dsi_exception( void ); extern void isi_exception( void ); @@ -417,7 +423,7 @@ setup_mmu( unsigned long ramsize ) asm volatile("mfmsr %0" : "=r" (msr) : ); msr |= MSR_IR | MSR_DR; - asm volatile("mtmsr %0" :: "r" (msr) ); + asm volatile(MTMSR " %0" :: "r" (msr) ); } void -- 1.7.3

2 6

[commit] r963 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 21 Nov '10

21 Nov '10

Author: afaerber Date: Sun Nov 21 11:36:35 2010 New Revision: 963 URL: http://tracker.coreboot.org/trac/openbios/changeset/963 Log: ppc: Use mtmsrd on ppc64 On ppc64 the mtmsr instruction only sets the low 32 bits of the MSR. mtmsrd must be used to set the high bits such as Sixty-Four Bit Mode as well. v2: * Introduce MTMSRD macro as seen on Linux, suggested by Alex. * Introduce inline functions {mfmsr,mtmsr} as suggested by Alex. Signed-off-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/include/arch/ppc/asmdefs.h trunk/openbios-devel/include/arch/ppc/processor.h Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 20 22:14:59 2010 (r962) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Nov 21 11:36:35 2010 (r963) @@ -387,7 +387,7 @@ setup_mmu( unsigned long ramsize ) { ofmem_t *ofmem; - unsigned long sdr1, sr_base, msr; + unsigned long sdr1, sr_base; unsigned long hash_base; unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */ int i; @@ -415,9 +415,7 @@ /* Enable MMU */ - asm volatile("mfmsr %0" : "=r" (msr) : ); - msr |= MSR_IR | MSR_DR; - asm volatile("mtmsr %0" :: "r" (msr) ); + mtmsr(mfmsr() | MSR_IR | MSR_DR); } void Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/asmdefs.h Sat Nov 20 22:14:59 2010 (r962) +++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Sun Nov 21 11:36:35 2010 (r963) @@ -90,8 +90,10 @@ #ifdef __powerpc64__ #define RFI rfid +#define MTMSRD(r) mtmsrd r #else #define RFI rfi +#define MTMSRD(r) mtmsr r #endif #ifndef __darwin__ Modified: trunk/openbios-devel/include/arch/ppc/processor.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/processor.h Sat Nov 20 22:14:59 2010 (r962) +++ trunk/openbios-devel/include/arch/ppc/processor.h Sun Nov 21 11:36:35 2010 (r963) @@ -403,8 +403,28 @@ /* C helpers */ +#ifndef __ASSEMBLER__ + #define __stringify_1(x) #x #define __stringify(x) __stringify_1(x) #define mtspr(rn, v) asm volatile("mtspr " __stringify(rn) ",%0" : : "r" (v)) +static inline unsigned long mfmsr(void) +{ + unsigned long msr; + asm volatile("mfmsr %0" : "=r" (msr)); + return msr; +} + +static inline void mtmsr(unsigned long msr) +{ +#ifdef __powerpc64__ + asm volatile("mtmsrd %0" :: "r" (msr)); +#else + asm volatile("mtmsr %0" :: "r" (msr)); +#endif +} + +#endif /* !__ASSEMBLER__ */ + #endif /* _H_PROCESSOR */

1 0

[commit] r962 - in trunk/openbios-devel: arch/ppc/qemu config/examples
by repository service 20 Nov '10

20 Nov '10

Author: afaerber Date: Sat Nov 20 22:14:59 2010 New Revision: 962 URL: http://tracker.coreboot.org/trac/openbios/changeset/962 Log: ppc: Turn 32-bit ppc64 into a config option, to be deprecated Having legacy 64-bit support as an option allows users to disable it and test the 32-bit only version prior to official removal of legacy 64-bit support. Fork single-bitness macros EXCEPTION_{PREAMBLE,EPILOGUE}: Use assembler macros for things that are constant to avoid ; and \, and use preprocessor macros to handle differences. Adopt QEMU coding style for new code. Functional changes for ppc64: * Don't clear MSR in preamble in order to stay in Sixty-Four Bit Mode. * Just save the minimum number of registers since 64-bit code will save the full registers. * Reserve 48 bytes of stack frame space for ppc64, according to 64-bit PowerPC ELF ABI supplement 1.9. * Use rfid via RFI macro. v2: * Remove inaccurate comment on unused stack location. * Add explanatory comments for #else and #endif. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/config/examples/ppc_config.xml Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Wed Nov 17 20:36:18 2010 (r961) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 20 22:14:59 2010 (r962) @@ -303,6 +303,7 @@ fword("finish-device"); } +#ifdef CONFIG_PPC_64BITSUPPORT /* In order to get 64 bit aware handlers that rescue all our GPRs from getting truncated to 32 bits, we need to patch the existing handlers so they jump to our 64 bit aware ones. */ @@ -322,6 +323,7 @@ asm ( "icbi 0, %0" : : "r"(dsi) ); asm ( "icbi 0, %0" : : "r"(isi) ); } +#endif static void cpu_970_init(const struct cpudef *cpu) @@ -341,10 +343,12 @@ fword("finish-device"); +#ifdef CONFIG_PPC_64BITSUPPORT /* The 970 is a PPC64 CPU, so we need to activate * 64bit aware interrupt handlers */ ppc64_patch_handlers(); +#endif /* The 970 also implements the HIOR which we need to set to 0 */ Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Wed Nov 17 20:36:18 2010 (r961) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Nov 20 22:14:59 2010 (r962) @@ -14,6 +14,7 @@ * */ +#include "autoconf.h" #include "asm/asmdefs.h" #include "asm/processor.h" @@ -24,6 +25,8 @@ #define ILLEGAL_VECTOR( v ) .org __vectors + v ; vector__##v: bl trap_error ; #define VECTOR( v, dummystr ) .org __vectors + v ; vector__##v +#ifdef CONFIG_PPC_64BITSUPPORT + /* We're trying to use the same code for the ppc32 and ppc64 handlers here. * On ppc32 we only save/restore the registers, C considers volatile. * @@ -176,6 +179,87 @@ #undef stl #undef ll +#else /* !CONFIG_PPC_64BITSUPPORT */ + +#ifdef __powerpc64__ + +#define ULONG_SIZE 8 +#define STACKFRAME_MINSIZE 48 +#define stl std +#define ll ld + +#else + +#define ULONG_SIZE 4 +#define STACKFRAME_MINSIZE 16 +#define stl stw +#define ll lwz + +#endif + +.macro EXCEPTION_PREAMBLE + mtsprg1 r1 /* scratch */ + mfsprg0 r1 /* exception stack in sprg0 */ + addi r1, r1, -(20 * ULONG_SIZE) /* push exception frame */ + + stl r0, ( 0 * ULONG_SIZE)(r1) /* save r0 */ + mfsprg1 r0 + stl r0, ( 1 * ULONG_SIZE)(r1) /* save r1 */ + stl r2, ( 2 * ULONG_SIZE)(r1) /* save r2 */ + stl r3, ( 3 * ULONG_SIZE)(r1) /* save r3 */ + stl r4, ( 4 * ULONG_SIZE)(r1) + stl r5, ( 5 * ULONG_SIZE)(r1) + stl r6, ( 6 * ULONG_SIZE)(r1) + stl r7, ( 7 * ULONG_SIZE)(r1) + stl r8, ( 8 * ULONG_SIZE)(r1) + stl r9, ( 9 * ULONG_SIZE)(r1) + stl r10, (10 * ULONG_SIZE)(r1) + stl r11, (11 * ULONG_SIZE)(r1) + stl r12, (12 * ULONG_SIZE)(r1) + + mflr r0 + stl r0, (13 * ULONG_SIZE)(r1) + mfcr r0 + stl r0, (14 * ULONG_SIZE)(r1) + mfctr r0 + stl r0, (15 * ULONG_SIZE)(r1) + mfxer r0 + stl r0, (16 * ULONG_SIZE)(r1) + + addi r1, r1, -STACKFRAME_MINSIZE /* C ABI saves LR and SP */ +.endm + +.macro EXCEPTION_EPILOGUE + addi r1, r1, STACKFRAME_MINSIZE /* pop ABI frame */ + + ll r0, (13 * ULONG_SIZE)(r1) + mtlr r0 + ll r0, (14 * ULONG_SIZE)(r1) + mtcr r0 + ll r0, (15 * ULONG_SIZE)(r1) + mtctr r0 + ll r0, (16 * ULONG_SIZE)(r1) + mtxer r0 + + ll r0, ( 0 * ULONG_SIZE)(r1) + ll r2, ( 2 * ULONG_SIZE)(r1) + ll r3, ( 3 * ULONG_SIZE)(r1) + ll r4, ( 4 * ULONG_SIZE)(r1) + ll r5, ( 5 * ULONG_SIZE)(r1) + ll r6, ( 6 * ULONG_SIZE)(r1) + ll r7, ( 7 * ULONG_SIZE)(r1) + ll r8, ( 8 * ULONG_SIZE)(r1) + ll r9, ( 9 * ULONG_SIZE)(r1) + ll r10, (10 * ULONG_SIZE)(r1) + ll r11, (11 * ULONG_SIZE)(r1) + ll r12, (12 * ULONG_SIZE)(r1) + + ll r1, ( 1 * ULONG_SIZE)(r1) /* restore stack at last */ + RFI +.endm + +#endif /* !CONFIG_PPC_64BITSUPPORT */ + /************************************************************************/ /* vectors */ /************************************************************************/ @@ -253,6 +337,8 @@ ILLEGAL_VECTOR( 0x1600 ) ILLEGAL_VECTOR( 0x1700 ) +#ifdef CONFIG_PPC_64BITSUPPORT + VECTOR( 0x2000, "DSI_64" ): EXCEPTION_PREAMBLE_64 LOAD_REG_IMMEDIATE(r3, dsi_exception) @@ -267,6 +353,8 @@ bctrl EXCEPTION_EPILOGUE_64 +#endif + GLOBL(__vectors_end): /************************************************************************/ @@ -275,7 +363,7 @@ GLOBL(_entry): -#ifndef __powerpc64__ +#ifdef CONFIG_PPC_64BITSUPPORT /* clear MSR, disable MMU */ li r0,0 Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Wed Nov 17 20:36:18 2010 (r961) +++ trunk/openbios-devel/config/examples/ppc_config.xml Sat Nov 20 22:14:59 2010 (r962) @@ -57,6 +57,7 @@ <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>  + <option name="CONFIG_PPC_64BITSUPPORT" type="boolean" value="true"/> <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> <option name="CONFIG_RTAS" type="boolean" value="false"/>

2 1

[commit] r961 - in trunk/openbios-devel: . config/xml
by repository service 17 Nov '10

17 Nov '10

Author: blueswirl Date: Wed Nov 17 20:36:18 2010 New Revision: 961 URL: http://tracker.coreboot.org/trac/openbios/changeset/961 Log: Introduce automatic build dependencies Use GCC to generate dependency files. Tested-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/config/xml/rules.xml Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Wed Nov 17 20:36:16 2010 (r960) +++ trunk/openbios-devel/Makefile.target Wed Nov 17 20:36:18 2010 (r961) @@ -14,6 +14,8 @@ HOSTCFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels HOSTCFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs HOSTCFLAGS+= -W +# Flags for dependency generation +HOSTCFLAGS+= -MMD -MP -MT $@ -MF '$(*D)/$(*F).d' HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := $(TARGET)gcc @@ -29,6 +31,8 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs CFLAGS+= -Werror +# Flags for dependency generation +CFLAGS+= -MMD -MP -MT $@ -MF '$(*D)/$(*F).d' INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS+= -g @@ -63,7 +67,7 @@ @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* @rm -f $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ -exec rm \{\} \; + @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.d' -o -name '*.a' $ -exec rm \{\} \; @echo " ok" build-verbose: info build @@ -71,3 +75,6 @@ build: all include rules.mak + +# Include automatically generated dependency files +-include $(wildcard $(ODIR)/host/kernel/*.d $(ODIR)/target/*/*.d $(ODIR)/target/*/*/*.d $(ODIR)/target/*/*/*/*.d) Modified: trunk/openbios-devel/config/xml/rules.xml ============================================================================== --- trunk/openbios-devel/config/xml/rules.xml Wed Nov 17 20:36:16 2010 (r960) +++ trunk/openbios-devel/config/xml/rules.xml Wed Nov 17 20:36:18 2010 (r961) @@ -4,11 +4,11 @@ $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) -o $@ $^," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="object"> - $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^," HOSTCC $(TARGET_DIR)$@") + $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $<," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="object" extracflags="1"> $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES)</rule> -<rule target="host" entity="object" extracflags="2"> -c -o $@ $^," HOSTCC $(TARGET_DIR)$@") +<rule target="host" entity="object" extracflags="2"> -c -o $@ $<," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="library"> $(call quiet--command,$(AR) cru $@ $^; $(RANLIB) $@," HOSTAR $(TARGET_DIR)$@") @@ -19,11 +19,11 @@ $(call quiet-command,$(CC) $(CFLAGS) -o $@ $^," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="object"> - $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^," CC $(TARGET_DIR)$@") + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $<," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="object" extracflags="1"> $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES)</rule> -<rule target="target" entity="object" extracflags="2"> -c -o $@ $^," CC $(TARGET_DIR)$@") +<rule target="target" entity="object" extracflags="2"> -c -o $@ $<," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="library"> $(call quiet-command,$(AR) cru $@ $^; $(RANLIB) $@," AR $(TARGET_DIR)$@")

1 0

[commit] r960 - trunk/openbios-devel/kernel
by repository service 17 Nov '10

17 Nov '10

Author: blueswirl Date: Wed Nov 17 20:36:16 2010 New Revision: 960 URL: http://tracker.coreboot.org/trac/openbios/changeset/960 Log: kernel: avoid including C files from another Merge kernel/internal.c and kernel/primitives.c into kernel/forth.c. This helps with the build dependencies. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Deleted: trunk/openbios-devel/kernel/internal.c trunk/openbios-devel/kernel/primitives.c Modified: trunk/openbios-devel/kernel/build.xml trunk/openbios-devel/kernel/forth.c Modified: trunk/openbios-devel/kernel/build.xml ============================================================================== --- trunk/openbios-devel/kernel/build.xml Mon Nov 15 23:13:13 2010 (r959) +++ trunk/openbios-devel/kernel/build.xml Wed Nov 17 20:36:16 2010 (r960) @@ -1,15 +1,15 @@ <build> <executable name="forthstrap" target="host"> - <object source="bootstrap.c"/> <object source="dict.c"/> - <object source="primitives.c"/> + <object source="bootstrap.c"/> + <object source="forth.c"/> <object source="stack.c"/> </executable> <library name="bootstrap" type="static" target="target"> <object source="dict.c"/> - <object source="primitives.c"/> + <object source="forth.c"/> <object source="stack.c"/> </library> Modified: trunk/openbios-devel/kernel/forth.c ============================================================================== --- trunk/openbios-devel/kernel/forth.c Mon Nov 15 23:13:13 2010 (r959) +++ trunk/openbios-devel/kernel/forth.c Wed Nov 17 20:36:16 2010 (r960) @@ -1,4 +1,5 @@ -/* tag: C implementation of all forth primitives +/* tag: C implementation of all forth primitives, + * internal words, inner interpreter and such * * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer * @@ -6,6 +7,833 @@ * the copyright and warranty status of this work. */ +#include "config.h" +#include "sysinclude.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" +#include "dict.h" + +/* + * cross platform abstraction + */ + +#include "cross.h" + +#ifndef FCOMPILER +#include "libc/vsprintf.h" +#else +#include <stdarg.h> +#endif + +/* + * execution works as follows: + * - PC is pushed on return stack + * - PC is set to new CFA + * - address pointed by CFA is executed by CPU + */ + +typedef void forth_word(void); + +static forth_word * const words[]; +ucell PC; +volatile int interruptforth = 0; + +#define DEBUG_MODE_NONE 0 +#define DEBUG_MODE_STEP 1 +#define DEBUG_MODE_TRACE 2 +#define DEBUG_MODE_STEPUP 3 + +#define DEBUG_BANNER "\nStepper keys: <space>/<enter> Up Down Trace Rstack Forth\n" + +/* Empty linked list of debug xts */ +struct debug_xt { + ucell xt_docol; + ucell xt_semis; + int mode; + struct debug_xt *next; +}; + +static struct debug_xt debug_xt_eol = { (ucell)0, (ucell)0, 0, NULL}; +static struct debug_xt *debug_xt_list = &debug_xt_eol; + +/* Static buffer for xt name */ +char xtname[MAXNFALEN]; + +#ifndef FCOMPILER +/* instead of pointing to an explicit 0 variable we + * point behind the pointer. + */ +static ucell t[] = { 0, 0, 0, 0 }; +static ucell *trampoline = t; + +/* + * Code Field Address (CFA) definitions (DOCOL and the like) + */ + +void forth_init(void) +{ + init_trampoline(trampoline); +} +#endif + +#ifndef CONFIG_DEBUG_INTERPRETER +#define dbg_interp_printk( a... ) do { } while(0) +#else +#define dbg_interp_printk( a... ) printk( a ) +#endif + +#ifndef CONFIG_DEBUG_INTERNAL +#define dbg_internal_printk( a... ) do { } while(0) +#else +#define dbg_internal_printk( a... ) printk( a ) +#endif + + +void init_trampoline(ucell *tramp) +{ + tramp[0] = DOCOL; + tramp[1] = 0; + tramp[2] = target_ucell(pointer2cell(tramp) + 3 * sizeof(ucell)); + tramp[3] = 0; +} + +static inline void processxt(ucell xt) +{ + void (*tokenp) (void); + + dbg_interp_printk("processxt: pc=%x, xt=%x\n", PC, xt); + tokenp = words[xt]; + tokenp(); +} + +static void docol(void) +{ /* DOCOL */ + PUSHR(PC); + PC = read_ucell(cell2pointer(PC)); + + dbg_interp_printk("docol: %s\n", cell2pointer( lfa2nfa(PC - sizeof(cell)) )); +} + +static void semis(void) +{ + PC = POPR(); +} + +static inline void next(void) +{ + PC += sizeof(ucell); + + dbg_interp_printk("next: PC is now %x\n", PC); + processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); +} + +static inline void next_dbg(void); + +int enterforth(xt_t xt) +{ + ucell *_cfa = (ucell*)cell2pointer(xt); + cell tmp; + + if (read_ucell(_cfa) != DOCOL) { + trampoline[1] = target_ucell(xt); + _cfa = trampoline; + } + + if (rstackcnt < 0) { + rstackcnt = 0; + } + + tmp = rstackcnt; + interruptforth = FORTH_INTSTAT_CLR; + + PUSHR(PC); + PC = pointer2cell(_cfa); + + while (rstackcnt > tmp && !(interruptforth & FORTH_INTSTAT_STOP)) { + if (debug_xt_list->next == NULL) { + while (rstackcnt > tmp && !interruptforth) { + dbg_interp_printk("enterforth: NEXT\n"); + next(); + } + } else { + while (rstackcnt > tmp && !interruptforth) { + dbg_interp_printk("enterforth: NEXT_DBG\n"); + next_dbg(); + } + } + + /* Always clear the debug mode change flag */ + interruptforth = interruptforth & (~FORTH_INTSTAT_DBG); + } + +#if 0 + /* return true if we took an exception. The caller should normally + * handle exceptions by returning immediately since the throw + * is supposed to abort the execution of this C-code too. + */ + + if (rstackcnt != tmp) { + printk("EXCEPTION DETECTED!\n"); + } +#endif + return rstackcnt != tmp; +} + +/* called inline thus a slightly different behaviour */ +static void lit(void) +{ /* LIT */ + PC += sizeof(cell); + PUSH(read_ucell(cell2pointer(PC))); + dbg_interp_printk("lit: %x\n", read_ucell(cell2pointer(PC))); +} + +static void docon(void) +{ /* DOCON */ + ucell tmp = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); + PUSH(tmp); + dbg_interp_printk("docon: PC=%x, value=%x\n", PC, tmp); +} + +static void dovar(void) +{ /* DOVAR */ + ucell tmp = read_ucell(cell2pointer(PC)) + sizeof(ucell); + PUSH(tmp); /* returns address to variable */ + dbg_interp_printk("dovar: PC: %x, %x\n", PC, tmp); +} + +static void dobranch(void) +{ /* unconditional branch */ + PC += sizeof(cell); + PC += read_cell(cell2pointer(PC)); +} + +static void docbranch(void) +{ /* conditional branch */ + PC += sizeof(cell); + if (POP()) { + dbg_internal_printk(" ?branch: end loop\n"); + } else { + dbg_internal_printk(" ?branch: follow branch\n"); + PC += read_cell(cell2pointer(PC)); + } +} + + +static void execute(void) +{ /* EXECUTE */ + ucell address = POP(); + dbg_interp_printk("execute: %x\n", address); + + PUSHR(PC); + trampoline[1] = target_ucell(address); + PC = pointer2cell(trampoline); +} + +/* + * call ( ... function-ptr -- ??? ) + */ +static void call(void) +{ +#ifdef FCOMPILER + printk("Sorry. Usage of Forth2C binding is forbidden during bootstrap.\n"); + exit(1); +#else + void (*funcptr) (void); + funcptr=(void *)cell2pointer(POP()); + dbg_interp_printk("call: %x", funcptr); + funcptr(); +#endif +} + +/* + * sys-debug ( errno -- ) + */ + +static void sysdebug(void) +{ +#ifdef FCOMPILER + cell errorno=POP(); + exception(errorno); +#else + (void) POP(); +#endif +} + +static void dodoes(void) +{ /* DODOES */ + ucell data = read_ucell(cell2pointer(PC)) + (2 * sizeof(ucell)); + ucell word = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); + + dbg_interp_printk("DODOES data=%x word=%x\n", data, word); + + PUSH(data); + PUSH(word); + + execute(); +} + +static void dodefer(void) +{ + docol(); +} + +static void dodo(void) +{ + cell startval, endval; + startval = POP(); + endval = POP(); + + PUSHR(endval); + PUSHR(startval); +} + +static void doisdo(void) +{ + cell startval, endval, offset; + + startval = POP(); + endval = POP(); + + PC += sizeof(cell); + + if (startval == endval) { + offset = read_cell(cell2pointer(PC)); + PC += offset; + } else { + PUSHR(endval); + PUSHR(startval); + } +} + +static void doloop(void) +{ + cell offset, startval, endval; + + startval = POPR() + 1; + endval = POPR(); + + PC += sizeof(cell); + + if (startval < endval) { + offset = read_cell(cell2pointer(PC)); + PC += offset; + PUSHR(endval); + PUSHR(startval); + } + +} + +static void doplusloop(void) +{ + ucell high, low; + cell increment, startval, endval, offset; + + increment = POP(); + + startval = POPR(); + endval = POPR(); + + low = (ucell) startval; + startval += increment; + + PC += sizeof(cell); + + if (increment >= 0) { + high = (ucell) startval; + } else { + high = low; + low = (ucell) startval; + } + + if (endval - (low + 1) >= high - low) { + offset = read_cell(cell2pointer(PC)); + PC += offset; + + PUSHR(endval); + PUSHR(startval); + } +} + +/* + * instance handling CFAs + */ +#ifndef FCOMPILER +static ucell get_myself(void) +{ + static ucell *myselfptr = NULL; + if (myselfptr == NULL) { + myselfptr = (ucell*)cell2pointer(findword("my-self")) + 1; + } + ucell *myself = (ucell*)cell2pointer(*myselfptr); + return (myself != NULL) ? *myself : 0; +} + +static void doivar(void) +{ + ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); + ucell ibase = get_myself(); + + dbg_interp_printk("ivar, offset: %d size: %d (ibase %d)\n", p[0], p[1], ibase ); + + r = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PUSH( r ); +} + +static void doival(void) +{ + ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); + ucell ibase = get_myself(); + + dbg_interp_printk("ivar, offset: %d size: %d\n", p[0], p[1] ); + + r = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PUSH( *(ucell *)cell2pointer(r) ); +} + +static void doidefer(void) +{ + ucell *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); + ucell ibase = get_myself(); + + dbg_interp_printk("doidefer, offset: %d size: %d\n", p[0], p[1] ); + + PUSHR(PC); + PC = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PC -= sizeof(ucell); +} +#else +static void noinstances(void) +{ + printk("Opening devices is not supported during bootstrap. Sorry.\n"); + exit(1); +} +#define doivar noinstances +#define doival noinstances +#define doidefer noinstances +#endif + +/* + * $include / $encode-file + */ +#ifdef FCOMPILER +static void +string_relay(void (*func)(const char *)) +{ + int len = POP(); + char *name, *p = (char*)cell2pointer(POP()); + name = malloc(len + 1); + memcpy(name, p, len); + name[len] = 0; + (*func)(name); + free(name); +} +#else +#define string_relay(dummy) do { DROP(); DROP(); } while(0) +#endif + +static void +do_include(void) +{ + string_relay(&include_file); +} + +static void +do_encode_file( void ) +{ + string_relay(&encode_file); +} + +/* + * Debug support functions + */ + +static +int printf_console(const char *fmt, ...) +{ + cell tmp; + + char buf[512]; + va_list args; + int i; + + va_start(args, fmt); + i = vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); + + /* Push to the Forth interpreter for console output */ + tmp = rstackcnt; + + PUSH(pointer2cell(buf)); + PUSH((int)strlen(buf)); + trampoline[1] = findword("type"); + + PUSHR(PC); + PC = pointer2cell(trampoline); + + while (rstackcnt > tmp) { + dbg_interp_printk("printf_console: NEXT\n"); + next(); + } + + return i; +} + +static +int getchar_console(void) +{ + cell tmp; + + /* Push to the Forth interpreter for console output */ + tmp = rstackcnt; + + trampoline[1] = findword("key"); + + PUSHR(PC); + PC = pointer2cell(trampoline); + + while (rstackcnt > tmp) { + dbg_interp_printk("getchar_console: NEXT\n"); + next(); + } + + return POP(); +} + +static void +display_dbg_dstack(void) +{ + /* Display dstack contents between parentheses */ + int i; + + if (dstackcnt == 0) { + printf_console(" ( Empty ) "); + return; + } else { + printf_console(" ( "); + for (i = 1; i <= dstackcnt; i++) { + if (i != 1) { + printf_console(" "); + } + printf_console("%" FMT_CELL_x, dstack[i]); + } + printf_console(" ) "); + } +} + +static void +display_dbg_rstack(void) +{ + /* Display rstack contents between parentheses */ + int i; + + if (rstackcnt == 0) { + printf_console(" ( Empty ) "); + return; + } else { + printf_console("\nR: ( "); + for (i = 1; i <= rstackcnt; i++) { + if (i != 1) { + printf_console(" "); + } + printf_console("%" FMT_CELL_x, rstack[i]); + } + printf_console(" ) \n"); + } +} + +static int +add_debug_xt(ucell xt) +{ + struct debug_xt *debug_xt_item; + + /* If the xt CFA isn't DOCOL then issue a warning and do nothing */ + if (read_ucell(cell2pointer(xt)) != DOCOL) { + printf_console("\nprimitive words cannot be debugged\n"); + return 0; + } + + /* If this xt is already in the list, do nothing but indicate success */ + for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; + debug_xt_item = debug_xt_item->next) + if (debug_xt_item->xt_docol == xt) { + return 1; + } + + /* We already have the CFA (PC) indicating the starting cell of + the word, however we also need the ending cell too (we cannot + rely on the rstack as it can be arbitrarily changed by a forth + word). Hence the use of findsemis() */ + + /* Otherwise add to the head of the linked list */ + debug_xt_item = malloc(sizeof(struct debug_xt)); + debug_xt_item->xt_docol = xt; + debug_xt_item->xt_semis = findsemis(xt); + debug_xt_item->mode = DEBUG_MODE_NONE; + debug_xt_item->next = debug_xt_list; + debug_xt_list = debug_xt_item; + + /* Indicate debug mode change */ + interruptforth |= FORTH_INTSTAT_DBG; + + /* Success */ + return 1; +} + +static void +del_debug_xt(ucell xt) +{ + struct debug_xt *debug_xt_item, *tmp_xt_item; + + /* Handle the case where the xt is at the head of the list */ + if (debug_xt_list->xt_docol == xt) { + tmp_xt_item = debug_xt_list; + debug_xt_list = debug_xt_list->next; + free(tmp_xt_item); + + return; + } + + /* Otherwise find this xt in the linked list and remove it */ + for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; + debug_xt_item = debug_xt_item->next) { + if (debug_xt_item->next->xt_docol == xt) { + tmp_xt_item = debug_xt_item->next; + debug_xt_item->next = debug_xt_item->next->next; + free(tmp_xt_item); + } + } + + /* If the list is now empty, indicate debug mode change */ + if (debug_xt_list->next == NULL) { + interruptforth |= FORTH_INTSTAT_DBG; + } +} + +static void +do_source_dbg(struct debug_xt *debug_xt_item) +{ + /* Forth source debugger implementation */ + char k, done = 0; + + /* Display current dstack */ + display_dbg_dstack(); + printf_console("\n"); + + fstrncpy(xtname, lfa2nfa(read_ucell(cell2pointer(PC)) - sizeof(cell)), MAXNFALEN); + printf_console("%p: %s ", cell2pointer(PC), xtname); + + /* If in trace mode, we just carry on */ + if (debug_xt_item->mode == DEBUG_MODE_TRACE) { + return; + } + + /* Otherwise in step mode, prompt for a keypress */ + k = getchar_console(); + + /* Only proceed if done is true */ + while (!done) { + switch (k) { + + case ' ': + case '\n': + /* Perform a single step */ + done = 1; + break; + + case 'u': + case 'U': + /* Up - unmark current word for debug, mark its caller for + * debugging and finish executing current word */ + + /* Since this word could alter the rstack during its execution, + * we only know the caller when (semis) is called for this xt. + * Hence we mark the xt as a special DEBUG_MODE_STEPUP which + * means we run as normal, but schedule the xt for deletion + * at its corresponding (semis) word when we know the rstack + * will be set to its final parent value */ + debug_xt_item->mode = DEBUG_MODE_STEPUP; + done = 1; + break; + + case 'd': + case 'D': + /* Down - mark current word for debug and step into it */ + done = add_debug_xt(read_ucell(cell2pointer(PC))); + if (!done) { + k = getchar_console(); + } + break; + + case 't': + case 'T': + /* Trace mode */ + debug_xt_item->mode = DEBUG_MODE_TRACE; + done = 1; + break; + + case 'r': + case 'R': + /* Display rstack */ + display_dbg_rstack(); + done = 0; + k = getchar_console(); + break; + + case 'f': + case 'F': + /* Start subordinate Forth interpreter */ + PUSHR(PC - sizeof(cell)); + PC = findword("outer-interpreter") + sizeof(ucell); + + /* Save rstack position for when we return */ + dbgrstackcnt = rstackcnt; + done = 1; + break; + + default: + /* Display debug banner */ + printf_console(DEBUG_BANNER); + k = getchar_console(); + } + } +} + +static void docol_dbg(void) +{ /* DOCOL */ + struct debug_xt *debug_xt_item; + + PUSHR(PC); + PC = read_ucell(cell2pointer(PC)); + + /* If current xt is in our debug xt list, display word name */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (debug_xt_item->xt_docol == PC) { + fstrncpy(xtname, lfa2nfa(PC - sizeof(cell)), MAXNFALEN); + printf_console("\n: %s ", xtname); + + /* Step mode is the default */ + debug_xt_item->mode = DEBUG_MODE_STEP; + } + + debug_xt_item = debug_xt_item->next; + } + + dbg_interp_printk("docol_dbg: %s\n", cell2pointer(lfa2nfa(PC - sizeof(cell)))); +} + +static void semis_dbg(void) +{ + struct debug_xt *debug_xt_item, *debug_xt_up = NULL; + + /* If current semis is in our debug xt list, disable debug mode */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (debug_xt_item->xt_semis == PC) { + if (debug_xt_item->mode != DEBUG_MODE_STEPUP) { + /* Handle the normal case */ + fstrncpy(xtname, lfa2nfa(debug_xt_item->xt_docol - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Finished %s ] ", xtname); + + /* Reset to step mode in case we were in trace mode */ + debug_xt_item->mode = DEBUG_MODE_STEP; + } else { + /* This word requires execution of the debugger "Up" + * semantics. However we can't do this here since we + * are iterating through the debug list, and we need + * to change it. So we do it afterwards. + */ + debug_xt_up = debug_xt_item; + } + } + + debug_xt_item = debug_xt_item->next; + } + + /* Execute debugger "Up" semantics if required */ + if (debug_xt_up) { + /* Only add the parent word if it is not within the trampoline */ + if (rstack[rstackcnt] != (cell)pointer2cell(&trampoline[1])) { + del_debug_xt(debug_xt_up->xt_docol); + add_debug_xt(findxtfromcell(rstack[rstackcnt])); + + fstrncpy(xtname, lfa2nfa(findxtfromcell(rstack[rstackcnt]) - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Up to %s ] ", xtname); + } else { + fstrncpy(xtname, lfa2nfa(findxtfromcell(debug_xt_up->xt_docol) - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Finished %s (Unable to go up, hit trampoline) ] ", xtname); + + del_debug_xt(debug_xt_up->xt_docol); + } + + debug_xt_up = NULL; + } + + PC = POPR(); +} + +static inline void next_dbg(void) +{ + struct debug_xt *debug_xt_item; + void (*tokenp) (void); + + PC += sizeof(ucell); + + /* If the PC lies within a debug range, run the source debugger */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (PC >= debug_xt_item->xt_docol && PC <= debug_xt_item->xt_semis && + debug_xt_item->mode != DEBUG_MODE_STEPUP) { + do_source_dbg(debug_xt_item); + } + + debug_xt_item = debug_xt_item->next; + } + + dbg_interp_printk("next_dbg: PC is now %x\n", PC); + + /* Intercept DOCOL and SEMIS and redirect to debug versions */ + if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOCOL) { + tokenp = docol_dbg; + tokenp(); + } else if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOSEMIS) { + tokenp = semis_dbg; + tokenp(); + } else { + /* Otherwise process as normal */ + processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); + } +} + +static void +do_debug_xt(void) +{ + ucell xt = POP(); + + /* Add to the debug list */ + if (add_debug_xt(xt)) { + /* Display debug banner */ + printf_console(DEBUG_BANNER); + + /* Indicate change to debug mode */ + interruptforth |= FORTH_INTSTAT_DBG; + } +} + +static void +do_debug_off(void) +{ + /* Empty the debug xt linked list */ + while (debug_xt_list->next != NULL) { + del_debug_xt(debug_xt_list->xt_docol); + } +} + +/* + * Forth primitives needed to set up + * all the words described in IEEE1275-1994. + */ + /* * dup ( x -- x x ) */ @@ -1019,3 +1847,120 @@ { PUSH(rstack[rstackcnt - 2]); } + +/* words[] is a function array of all native code functions used by + * the dictionary, i.e. CFAs and primitives. + * Any change here needs a matching change in the primitive word's + * name list that is kept for bootstrapping in kernel/bootstrap.c + * + * NOTE: THIS LIST SHALL NOT CHANGE (EXCEPT MANDATORY ADDITIONS AT + * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER + * BINARY DICTIONARIES. + */ +static forth_word * const words[] = { + /* + * CFAs and special words + */ + semis, + docol, + lit, + docon, + dovar, + dodefer, + dodoes, + dodo, + doisdo, + doloop, + doplusloop, + doival, + doivar, + doidefer, + + /* + * primitives + */ + fdup, /* dup */ + twodup, /* 2dup */ + isdup, /* ?dup */ + over, /* over */ + twoover, /* 2over */ + pick, /* pick */ + drop, /* drop */ + twodrop, /* 2drop */ + nip, /* nip */ + roll, /* roll */ + rot, /* rot */ + minusrot, /* -rot */ + swap, /* swap */ + twoswap, /* 2swap */ + tor, /* >r */ + rto, /* r> */ + rfetch, /* r@ */ + depth, /* depth */ + depthwrite, /* depth! */ + rdepth, /* rdepth */ + rdepthwrite, /* rdepth! */ + plus, /* + */ + minus, /* - */ + mult, /* * */ + umult, /* u* */ + mudivmod, /* mu/mod */ + forthabs, /* abs */ + negate, /* negate */ + max, /* max */ + min, /* min */ + lshift, /* lshift */ + rshift, /* rshift */ + rshifta, /* >>a */ + and, /* and */ + or, /* or */ + xor, /* xor */ + invert, /* invert */ + dplus, /* d+ */ + dminus, /* d- */ + mmult, /* m* */ + ummult, /* um* */ + fetch, /* @ */ + cfetch, /* c@ */ + wfetch, /* w@ */ + lfetch, /* l@ */ + store, /* ! */ + plusstore, /* +! */ + cstore, /* c! */ + wstore, /* w! */ + lstore, /* l! */ + equals, /* = */ + greater, /* > */ + less, /* < */ + ugreater, /* u> */ + uless, /* u< */ + spfetch, /* sp@ */ + fmove, /* move */ + ffill, /* fill */ + emit, /* emit */ + iskey, /* key? */ + key, /* key */ + execute, /* execute */ + here, /* here */ + herewrite, /* here! */ + dobranch, /* dobranch */ + docbranch, /* do?branch */ + unalignedwordread, /* unaligned-w@ */ + unalignedwordwrite, /* unaligned-w! */ + unalignedlongread, /* unaligned-l@ */ + unalignedlongwrite, /* unaligned-l! */ + iocfetch, /* ioc@ */ + iowfetch, /* iow@ */ + iolfetch, /* iol@ */ + iocstore, /* ioc! */ + iowstore, /* iow! */ + iolstore, /* iol! */ + loop_i, /* i */ + loop_j, /* j */ + call, /* call */ + sysdebug, /* sys-debug */ + do_include, /* $include */ + do_encode_file, /* $encode-file */ + do_debug_xt, /* (debug */ + do_debug_off, /* (debug-off) */ +};

1 0