Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1727 → Rev 1728

/boot/trunk/boot.config
19,6 → 19,9
# Debug bootloader
! [ARCH=ppc32] CONFIG_DEBUG (n/y)
 
# Use Block Address Translation
! [ARCH=ppc32] CONFIG_BAT (y/n)
 
# PPC64 Compiler
@ "cross" Cross-compiler
@ "native" Native
/boot/trunk/arch/ppc32/loader/asm.S
190,20 → 190,33
DEBUG_segments
# initially fill segment registers
 
li r31, 16
mtctr r31
li r31, 0
li r30, 0x2000
li r29, 8
mtctr r29
li r30, 0
 
seg_fill:
seg_fill_uspace:
mtsrin r30, r31
addi r30, r30, 0x111
addi r30, r30, 1
addis r31, r31, 0x1000 # move to next SR
bdnz seg_fill
bdnz seg_fill_uspace
li r29, 8
mtctr r29
li r30, 0x4000
seg_fill_kernel:
mtsrin r30, r31
addi r30, r30, 1
addis r31, r31, 0x1000 # move to next SR
bdnz seg_fill_kernel
# invalidate block address translation registers
DEBUG_bat
241,10 → 254,34
lis r31, 0x07ff
ori r31, r31, 0x0000
li r30, 0x4000
li r29, 0
pht_clear:
stw r29, 0(r31)
addi r31, r31, 4
subi r30, r30, 4
cmpwi r30, 0
beq clear_end
bdnz pht_clear
 
DEBUG_end_pht_clear
clear_end:
lis r31, 0x07ff
ori r31, r31, 0x0000
mtsdr1 r31
# create identity mapping
#ifdef CONFIG_BAT
DEBUG_mapping
# FIXME: map exactly the size of RAM
260,6 → 297,8
mtspr dbat0u, r31
mtspr dbat0l, r30
 
#endif
DEBUG_tlb
270,7 → 309,11
# start the kernel
#
# pc = KERNEL_START_ADDR
# r3 = bootinfo (pa)
# sprg0 = KA2PA(KERNEL_START_ADDR)
# sprg3 = physical memory size
# sp = 0 (pa)
lis r31, KERNEL_START_ADDR@ha
addi r31, r31, KERNEL_START_ADDR@l
277,6 → 320,14
mtspr srr0, r31
subis r31, r31, 0x8000
mtsprg0 r31
lwz r31, 0(r3)
mtsprg3 r31
li sp, 0
mfmsr r31
ori r31, r31, (msr_ir | msr_dr)@l
mtspr srr1, r31
/boot/trunk/arch/ppc32/loader/main.h
51,8 → 51,8
} taskmap_t;
 
typedef struct {
memmap_t memmap;
taskmap_t taskmap;
memmap_t memmap;
screen_t screen;
keyboard_t keyboard;
} bootinfo_t;
/boot/trunk/arch/ppc32/loader/debug.inc
8302,3 → 8302,8
#ifdef CONFIG_DEBUG
#endif
.endm
 
.macro DEBUG_end_pht_clear
#ifdef CONFIG_DEBUG
#endif
.endm