reformatted

This commit is contained in:
Markus Fröschle
2015-01-18 21:05:05 +00:00
parent bef7fdbc2e
commit 642a994f81
4 changed files with 139 additions and 115 deletions

View File

@@ -390,7 +390,7 @@ void BaS(void)
NOP(); /* force pipeline sync */ NOP(); /* force pipeline sync */
xprintf("finished\r\n"); xprintf("finished\r\n");
#ifdef MACHINE_FIREBEE #ifdef MACHINE_FIREBEE
xprintf("IDE reset: "); xprintf("IDE reset: ");
/* IDE reset */ /* IDE reset */
* (volatile uint8_t *) (0xffff8802 - 2) = 14; * (volatile uint8_t *) (0xffff8802 - 2) = 14;

View File

@@ -55,44 +55,57 @@ void fault_handler(uint32_t pc, uint32_t format_status)
case 0: case 0:
xprintf("not an access or address error nor an interrupted debug service routine"); xprintf("not an access or address error nor an interrupted debug service routine");
break; break;
case 1: case 1:
case 3: case 3:
case 11: case 11:
xprintf("reserved"); xprintf("reserved");
break; break;
case 2: case 2:
xprintf("interrupt during a debug service routine for faults other than access errors"); xprintf("interrupt during a debug service routine for faults other than access errors");
break; break;
case 4: case 4:
xprintf("error (for example, protection fault) on instruction fetch"); xprintf("error (for example, protection fault) on instruction fetch");
break; break;
case 5: case 5:
xprintf("TLB miss on opword or instruction fetch"); xprintf("TLB miss on opword or instruction fetch");
break; break;
case 6: case 6:
xprintf("TLB miss on extension word of instruction fetch"); xprintf("TLB miss on extension word of instruction fetch");
break; break;
case 7: case 7:
xprintf("IFP access error while executing in emulator mode"); xprintf("IFP access error while executing in emulator mode");
break; break;
case 8: case 8:
xprintf("error on data write"); xprintf("error on data write");
break; break;
case 9: case 9:
xprintf("error on attempted write to write-protected space"); xprintf("error on attempted write to write-protected space");
break; break;
case 10: case 10:
xprintf("TLB miss on data write"); xprintf("TLB miss on data write");
break; break;
case 12: case 12:
xprintf("error on data read"); xprintf("error on data read");
break; break;
case 13: case 13:
xprintf("attempted read, read-modify-write of protected space"); xprintf("attempted read, read-modify-write of protected space");
break; break;
case 14: case 14:
xprintf("TLB miss on data read or read-modify-write"); xprintf("TLB miss on data read or read-modify-write");
break; break;
case 15: case 15:
xprintf("OEP access error while executing in emulator mode"); xprintf("OEP access error while executing in emulator mode");
} }
@@ -104,39 +117,51 @@ void fault_handler(uint32_t pc, uint32_t format_status)
case 2: case 2:
xprintf("access error"); xprintf("access error");
break; break;
case 3: case 3:
xprintf("address error"); xprintf("address error");
break; break;
case 4: case 4:
xprintf("illegal instruction"); xprintf("illegal instruction");
break; break;
case 5: case 5:
xprintf("divide by zero"); xprintf("divide by zero");
break; break;
case 8: case 8:
xprintf("privilege violation"); xprintf("privilege violation");
break; break;
case 9: case 9:
xprintf("trace"); xprintf("trace");
break; break;
case 10: case 10:
xprintf("unimplemented line-a opcode"); xprintf("unimplemented line-a opcode");
break; break;
case 11: case 11:
xprintf("unimplemented line-f opcode"); xprintf("unimplemented line-f opcode");
break; break;
case 12: case 12:
xprintf("non-PC breakpoint debug interrupt"); xprintf("non-PC breakpoint debug interrupt");
break; break;
case 13: case 13:
xprintf("PC breakpoint debug interrupt"); xprintf("PC breakpoint debug interrupt");
break; break;
case 14: case 14:
xprintf("format error"); xprintf("format error");
break; break;
case 24: case 24:
xprintf("spurious interrupt"); xprintf("spurious interrupt");
break; break;
default: default:
if ( ((vector >= 6) && (vector <= 7)) || if ( ((vector >= 6) && (vector <= 7)) ||
((vector >= 16) && (vector <= 23))) ((vector >= 16) && (vector <= 23)))

View File

@@ -763,8 +763,7 @@ void mmu_init(void)
} }
uint32_t mmutr_miss(uint32_t mmu_sr, uint32_t fault_address, uint32_t pc, uint32_t mmutr_miss(uint32_t mmu_sr, uint32_t fault_address, uint32_t pc, uint32_t format_status)
uint32_t format_status)
{ {
uint32_t fault = format_status & 0xc030000; uint32_t fault = format_status & 0xc030000;