From d8e6d79320849a0ba0e89374e46c94699c0d0d8c Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 17 Nov 2015 10:52:22 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8503 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/common/ports/e200/devices/SPC560BCxx/boot.s | 32 ++--- os/common/ports/e200/devices/SPC560Bxx/boot.s | 32 ++--- os/common/ports/e200/devices/SPC560Dxx/boot.s | 156 ++++++++++++------------- os/common/ports/e200/devices/SPC560Pxx/boot.s | 32 ++--- 4 files changed, 126 insertions(+), 126 deletions(-) diff --git a/os/common/ports/e200/devices/SPC560BCxx/boot.s b/os/common/ports/e200/devices/SPC560BCxx/boot.s index 668c6c911..6ad24a948 100644 --- a/os/common/ports/e200/devices/SPC560BCxx/boot.s +++ b/os/common/ports/e200/devices/SPC560BCxx/boot.s @@ -153,37 +153,37 @@ _ivinit: .globl IVORS IVORS: -IVOR0: b IVOR0 + b _IVOR0 .align 4 -IVOR1: b _IVOR1 + b _IVOR1 .align 4 -IVOR2: b _IVOR2 + b _IVOR2 .align 4 -IVOR3: b _IVOR3 + b _IVOR3 .align 4 -IVOR4: b _IVOR4 + b _IVOR4 .align 4 -IVOR5: b _IVOR5 + b _IVOR5 .align 4 -IVOR6: b _IVOR6 + b _IVOR6 .align 4 -IVOR7: b _IVOR7 + b _IVOR7 .align 4 -IVOR8: b _IVOR8 + b _IVOR8 .align 4 -IVOR9: b _IVOR9 + b _IVOR9 .align 4 -IVOR10: b _IVOR10 + b _IVOR10 .align 4 -IVOR11: b _IVOR11 + b _IVOR11 .align 4 -IVOR12: b _IVOR12 + b _IVOR12 .align 4 -IVOR13: b _IVOR13 + b _IVOR13 .align 4 -IVOR14: b _IVOR14 + b _IVOR14 .align 4 -IVOR15: b _IVOR15 + b _IVOR15 .section .handlers, "ax" diff --git a/os/common/ports/e200/devices/SPC560Bxx/boot.s b/os/common/ports/e200/devices/SPC560Bxx/boot.s index 1f54ab285..d745b4fe4 100644 --- a/os/common/ports/e200/devices/SPC560Bxx/boot.s +++ b/os/common/ports/e200/devices/SPC560Bxx/boot.s @@ -153,37 +153,37 @@ _ivinit: .globl IVORS IVORS: -IVOR0: b IVOR0 + b _IVOR0 .align 4 -IVOR1: b _IVOR1 + b _IVOR1 .align 4 -IVOR2: b _IVOR2 + b _IVOR2 .align 4 -IVOR3: b _IVOR3 + b _IVOR3 .align 4 -IVOR4: b _IVOR4 + b _IVOR4 .align 4 -IVOR5: b _IVOR5 + b _IVOR5 .align 4 -IVOR6: b _IVOR6 + b _IVOR6 .align 4 -IVOR7: b _IVOR7 + b _IVOR7 .align 4 -IVOR8: b _IVOR8 + b _IVOR8 .align 4 -IVOR9: b _IVOR9 + b _IVOR9 .align 4 -IVOR10: b _IVOR10 + b _IVOR10 .align 4 -IVOR11: b _IVOR11 + b _IVOR11 .align 4 -IVOR12: b _IVOR12 + b _IVOR12 .align 4 -IVOR13: b _IVOR13 + b _IVOR13 .align 4 -IVOR14: b _IVOR14 + b _IVOR14 .align 4 -IVOR15: b _IVOR15 + b _IVOR15 .section .handlers, "ax" diff --git a/os/common/ports/e200/devices/SPC560Dxx/boot.s b/os/common/ports/e200/devices/SPC560Dxx/boot.s index 7b5efba37..8d57eee1e 100644 --- a/os/common/ports/e200/devices/SPC560Dxx/boot.s +++ b/os/common/ports/e200/devices/SPC560Dxx/boot.s @@ -48,24 +48,24 @@ _reset_address: /* * Image relocation in RAM. */ - lis %r4, __ram_reloc_start__@h - ori %r4, %r4, __ram_reloc_start__@l - lis %r5, __ram_reloc_dest__@h - ori %r5, %r5, __ram_reloc_dest__@l - lis %r6, __ram_reloc_end__@h - ori %r6, %r6, __ram_reloc_end__@l + lis r4, __ram_reloc_start__@h + ori r4, r4, __ram_reloc_start__@l + lis r5, __ram_reloc_dest__@h + ori r5, r5, __ram_reloc_dest__@l + lis r6, __ram_reloc_end__@h + ori r6, r6, __ram_reloc_end__@l .relloop: - cmpl cr0, %r4, %r6 + cmpl cr0, r4, r6 bge cr0, .relend - lwz %r7, 0(%r4) - addi %r4, %r4, 4 - stw %r7, 0(%r5) - addi %r5, %r5, 4 + lwz r7, 0(r4) + addi r4, r4, 4 + stw r7, 0(r5) + addi r5, r5, 4 b .relloop .relend: - lis %r3, _boot_address@h - ori %r3, %r3, _boot_address@l - mtctr %r3 + lis r3, _boot_address@h + ori r3, r3, _boot_address@l + mtctr r3 bctrl #else b _boot_address @@ -79,55 +79,55 @@ _coreinit: * order to initialize the ECC detection hardware, this is going to * slow down the startup but there is no way around. */ - xor %r0, %r0, %r0 - xor %r1, %r1, %r1 - xor %r2, %r2, %r2 - xor %r3, %r3, %r3 - xor %r4, %r4, %r4 - xor %r5, %r5, %r5 - xor %r6, %r6, %r6 - xor %r7, %r7, %r7 - xor %r8, %r8, %r8 - xor %r9, %r9, %r9 - xor %r10, %r10, %r10 - xor %r11, %r11, %r11 - xor %r12, %r12, %r12 - xor %r13, %r13, %r13 - xor %r14, %r14, %r14 - xor %r15, %r15, %r15 - xor %r16, %r16, %r16 - xor %r17, %r17, %r17 - xor %r18, %r18, %r18 - xor %r19, %r19, %r19 - xor %r20, %r20, %r20 - xor %r21, %r21, %r21 - xor %r22, %r22, %r22 - xor %r23, %r23, %r23 - xor %r24, %r24, %r24 - xor %r25, %r25, %r25 - xor %r26, %r26, %r26 - xor %r27, %r27, %r27 - xor %r28, %r28, %r28 - xor %r29, %r29, %r29 - xor %r30, %r30, %r30 - xor %r31, %r31, %r31 - lis %r4, __ram_start__@h - ori %r4, %r4, __ram_start__@l - lis %r5, __ram_end__@h - ori %r5, %r5, __ram_end__@l + xor r0, r0, r0 + xor r1, r1, r1 + xor r2, r2, r2 + xor r3, r3, r3 + xor r4, r4, r4 + xor r5, r5, r5 + xor r6, r6, r6 + xor r7, r7, r7 + xor r8, r8, r8 + xor r9, r9, r9 + xor r10, r10, r10 + xor r11, r11, r11 + xor r12, r12, r12 + xor r13, r13, r13 + xor r14, r14, r14 + xor r15, r15, r15 + xor r16, r16, r16 + xor r17, r17, r17 + xor r18, r18, r18 + xor r19, r19, r19 + xor r20, r20, r20 + xor r21, r21, r21 + xor r22, r22, r22 + xor r23, r23, r23 + xor r24, r24, r24 + xor r25, r25, r25 + xor r26, r26, r26 + xor r27, r27, r27 + xor r28, r28, r28 + xor r29, r29, r29 + xor r30, r30, r30 + xor r31, r31, r31 + lis r4, __ram_start__@h + ori r4, r4, __ram_start__@l + lis r5, __ram_end__@h + ori r5, r5, __ram_end__@l .cleareccloop: - cmpl %cr0, %r4, %r5 - bge %cr0, .cleareccend - stmw %r16, 0(%r4) - addi %r4, %r4, 64 + cmpl cr0, r4, r5 + bge cr0, .cleareccend + stmw r16, 0(r4) + addi r4, r4, 64 b .cleareccloop .cleareccend: /* * Branch prediction enabled. */ - li %r3, BOOT_BUCSR_DEFAULT - mtspr 1013, %r3 /* BUCSR */ + li r3, BOOT_BUCSR_DEFAULT + mtspr 1013, r3 /* BUCSR */ blr #endif /* BOOT_PERFORM_CORE_INIT */ @@ -138,14 +138,14 @@ _coreinit: .align 2 _ivinit: /* MSR initialization.*/ - lis %r3, BOOT_MSR_DEFAULT@h - ori %r3, %r3, BOOT_MSR_DEFAULT@l - mtMSR %r3 + lis r3, BOOT_MSR_DEFAULT@h + ori r3, r3, BOOT_MSR_DEFAULT@l + mtMSR r3 /* IVPR initialization.*/ - lis %r3, __ivpr_base__@h - ori %r3, %r3, __ivpr_base__@l - mtIVPR %r3 + lis r3, __ivpr_base__@h + ori r3, r3, __ivpr_base__@l + mtIVPR r3 blr @@ -153,37 +153,37 @@ _ivinit: .globl IVORS IVORS: -IVOR0: b IVOR0 + b _IVOR0 .align 4 -IVOR1: b _IVOR1 + b _IVOR1 .align 4 -IVOR2: b _IVOR2 + b _IVOR2 .align 4 -IVOR3: b _IVOR3 + b _IVOR3 .align 4 -IVOR4: b _IVOR4 + b _IVOR4 .align 4 -IVOR5: b _IVOR5 + b _IVOR5 .align 4 -IVOR6: b _IVOR6 + b _IVOR6 .align 4 -IVOR7: b _IVOR7 + b _IVOR7 .align 4 -IVOR8: b _IVOR8 + b _IVOR8 .align 4 -IVOR9: b _IVOR9 + b _IVOR9 .align 4 -IVOR10: b _IVOR10 + b _IVOR10 .align 4 -IVOR11: b _IVOR11 + b _IVOR11 .align 4 -IVOR12: b _IVOR12 + b _IVOR12 .align 4 -IVOR13: b _IVOR13 + b _IVOR13 .align 4 -IVOR14: b _IVOR14 + b _IVOR14 .align 4 -IVOR15: b _IVOR15 + b _IVOR15 .section .handlers, "ax" diff --git a/os/common/ports/e200/devices/SPC560Pxx/boot.s b/os/common/ports/e200/devices/SPC560Pxx/boot.s index 02171bece..2dc5abbf5 100644 --- a/os/common/ports/e200/devices/SPC560Pxx/boot.s +++ b/os/common/ports/e200/devices/SPC560Pxx/boot.s @@ -153,37 +153,37 @@ _ivinit: .globl IVORS IVORS: -IVOR0: b IVOR0 + b _IVOR0 .align 4 -IVOR1: b _IVOR1 + b _IVOR1 .align 4 -IVOR2: b _IVOR2 + b _IVOR2 .align 4 -IVOR3: b _IVOR3 + b _IVOR3 .align 4 -IVOR4: b _IVOR4 + b _IVOR4 .align 4 -IVOR5: b _IVOR5 + b _IVOR5 .align 4 -IVOR6: b _IVOR6 + b _IVOR6 .align 4 -IVOR7: b _IVOR7 + b _IVOR7 .align 4 -IVOR8: b _IVOR8 + b _IVOR8 .align 4 -IVOR9: b _IVOR9 + b _IVOR9 .align 4 -IVOR10: b _IVOR10 + b _IVOR10 .align 4 -IVOR11: b _IVOR11 + b _IVOR11 .align 4 -IVOR12: b _IVOR12 + b _IVOR12 .align 4 -IVOR13: b _IVOR13 + b _IVOR13 .align 4 -IVOR14: b _IVOR14 + b _IVOR14 .align 4 -IVOR15: b _IVOR15 + b _IVOR15 .section .handlers, "ax" -- cgit v1.2.3