Ticket #9490: gci2012-7980209-patch.diff
File gci2012-7980209-patch.diff, 25.4 KB (added by , 12 years ago) |
---|
-
src/servers/index/CatchUpManager.cpp
diff --git a/src/servers/index/CatchUpManager.cpp b/src/servers/index/CatchUpManager.cpp index f2c6750..80fb695 100644
a b CatchUpAnalyser::CatchUpAnalyser(const BVolume& volume, time_t start, 26 26 time_t end, BHandler* manager) 27 27 : 28 28 AnalyserDispatcher("CatchUpAnalyser"), 29 30 29 fVolume(volume), 31 30 fStart(start), 32 31 fEnd(end), -
src/servers/index/IndexServer.cpp
diff --git a/src/servers/index/IndexServer.cpp b/src/servers/index/IndexServer.cpp index 5098e4b..9ed3d0e 100644
a b AnalyserMonitorHandler::AddOnDisabled(const add_on_entry_info* entryInfo) 79 79 IndexServer::IndexServer() 80 80 : 81 81 BApplication("application/x-vnd.Haiku-index_server"), 82 83 82 fVolumeObserverHandler(this), 84 83 fAddOnMonitorHandler(this), 85 84 fPulseRunner(NULL) -
src/system/kernel/arch/arm/arch_debug.cpp
diff --git a/src/system/kernel/arch/arm/arch_debug.cpp b/src/system/kernel/arch/arm/arch_debug.cpp index daae859..9a781f6 100644
a b stack_trace(int argc, char **argv) 137 137 thread = thread_get_current_thread(); 138 138 framePointer = (addr_t)get_current_stack_frame(); 139 139 } else { 140 kprintf("Stack traces of other threads not supported yet!\n");141 return 0;140 kprintf("Stack traces of other threads not supported yet!\n"); 141 return 0; 142 142 } 143 143 144 144 // We don't have a thread pointer early in the boot process -
src/system/kernel/arch/arm/arch_elf.cpp
diff --git a/src/system/kernel/arch/arm/arch_elf.cpp b/src/system/kernel/arch/arm/arch_elf.cpp index 62fc17e..256362b 100644
a b 34 34 35 35 #ifdef TRACE_ARCH_ELF 36 36 static const char *kRelocations[] = { 37 "R_ARM_NONE", //0 Static Miscellaneous38 "R_ARM_PC24", //1 Deprecated ARM ((S + A) | T) ? P39 "R_ARM_ABS32", //2 Static Data (S + A) | T40 "R_ARM_REL32", //3 Static Data ((S + A) | T) ? P41 "R_ARM_LDR_PC_G0", //4 Static ARM S + A ? P42 "R_ARM_ABS16", //5 Static Data S + A43 "R_ARM_ABS12", //6 Static ARM S + A44 "R_ARM_THM_ABS5", //7 Static Thumb16 S + A45 "R_ARM_ABS8", //8 Static Data S + A46 "R_ARM_SBREL32", //9 Static Data ((S + A) | T) ? B(S)47 "R_ARM_THM_CALL", //10 Static Thumb32 ((S + A) | T) ? P48 "R_ARM_THM_PC8", //11 Static Thumb16 S + A ? Pa49 "R_ARM_BREL_ADJ", //12 Dynamic Data ?B(S) + A50 "R_ARM_TLS_DESC", //13 Dynamic Data51 "R_ARM_THM_SWI8", //14 Obsolete52 "R_ARM_XPC25", //15 Obsolete53 "R_ARM_THM_XPC22", //16 Obsolete Encodings reserved for future Dynamic relocations54 "R_ARM_TLS_DTPMOD32", //17 Dynamic Data Module[S]55 "R_ARM_TLS_DTPOFF32", //18 Dynamic Data S + A ? TLS56 "R_ARM_TLS_TPOFF32", //19 Dynamic Data S + A ? tp57 "R_ARM_COPY", //20 Dynamic Miscellaneous58 "R_ARM_GLOB_DAT", //21 Dynamic Data (S + A) | T59 "R_ARM_JUMP_SLOT", //22 Dynamic Data (S + A) | T60 "R_ARM_RELATIVE", //23 Dynamic Data B(S) + A [Note: see Table 4-16]61 "R_ARM_GOTOFF32", //24 Static Data ((S + A) | T) ? GOT_ORG62 "R_ARM_BASE_PREL", //25 Static Data B(S) + A ? P63 "R_ARM_GOT_BREL", //26 Static Data GOT(S) + A ? GOT_ORG64 "R_ARM_PLT32", //27 Deprecated ARM ((S + A) | T) ? P65 "R_ARM_CALL", //28 Static ARM ((S + A) | T) ? P66 "R_ARM_JUMP24", //29 Static ARM ((S + A) | T) ? P67 "R_ARM_THM_JUMP24", //30 Static Thumb32 ((S + A) | T) ? P68 "R_ARM_BASE_ABS", //31 Static Data B(S) + A69 "R_ARM_ALU_PCREL_7_0", //32 Obsolete70 "R_ARM_ALU_PCREL_15_8", //33 Obsolete71 "R_ARM_ALU_PCREL_23_15", //34 Obsolete Note ? Legacy (ARM ELF B02) names have been retained for these obsolete relocations.72 "R_ARM_LDR_SBREL_11_0_NC", //35 Deprecated ARM S + A ? B(S)73 "R_ARM_ALU_SBREL_19_12_NC", //36 Deprecated ARM S + A ? B(S)74 "R_ARM_ALU_SBREL_27_20_CK", //37 Deprecated ARM S + A ? B(S)75 "R_ARM_TARGET1", //38 Static Miscellaneous (S + A) | T or ((S + A) | T) ? P76 "R_ARM_SBREL31", //39 Deprecated Data ((S + A) | T) ? B(S)77 "R_ARM_V4BX", //40 Static Miscellaneous78 "R_ARM_TARGET2", //41 Static Miscellaneous79 "R_ARM_PREL31", //42 Static Data ((S + A) | T) ? P80 "R_ARM_MOVW_ABS_NC", //43 Static ARM (S + A) | T81 "R_ARM_MOVT_ABS", //44 Static ARM S + A82 "R_ARM_MOVW_PREL_NC", //45 Static ARM ((S + A) | T) ? P83 "R_ARM_MOVT_PREL", //46 Static ARM S + A ? P84 "R_ARM_THM_MOVW_ABS_NC", //47 Static Thumb32 (S + A) | T85 "R_ARM_THM_MOVT_ABS", //48 Static Thumb32 S + A86 "R_ARM_THM_MOVW_PREL_NC", //49 Static Thumb32 ((S + A) | T) ? P87 "R_ARM_THM_MOVT_PREL", //50 Static Thumb32 S + A ? P88 "R_ARM_THM_JUMP19", //51 Static Thumb32 ((S + A) | T) ? P89 "R_ARM_THM_JUMP6", //52 Static Thumb16 S + A ? P90 "R_ARM_THM_ALU_PREL_11_0", //53 Static Thumb32 ((S + A) | T) ? Pa91 "R_ARM_THM_PC12", //54 Static Thumb32 S + A ? Pa92 "R_ARM_ABS32_NOI", //55 Static Data S + A93 "R_ARM_REL32_NOI", //56 Static Data S + A ? P94 "R_ARM_ALU_PC_G0_NC", //57 Static ARM ((S + A) | T) ? P95 "R_ARM_ALU_PC_G0", //58 Static ARM ((S + A) | T) ? P96 "R_ARM_ALU_PC_G1_NC", //59 Static ARM ((S + A) | T) ? P97 "R_ARM_ALU_PC_G1", //60 Static ARM ((S + A) | T) ? P98 "R_ARM_ALU_PC_G2", //61 Static ARM ((S + A) | T) ? P99 "R_ARM_LDR_PC_G1", //62 Static ARM S + A ? P100 "R_ARM_LDR_PC_G2", //63 Static ARM S + A ? P101 "R_ARM_LDRS_PC_G0", //64 Static ARM S + A ? P102 "R_ARM_LDRS_PC_G1", //65 Static ARM S + A ? P103 "R_ARM_LDRS_PC_G2", //66 Static ARM S + A ? P104 "R_ARM_LDC_PC_G0", //67 Static ARM S + A ? P105 "R_ARM_LDC_PC_G1", //68 Static ARM S + A ? P106 "R_ARM_LDC_PC_G2", //69 Static ARM S + A ? P107 "R_ARM_ALU_SB_G0_NC", //70 Static ARM ((S + A) | T) ? B(S)108 "R_ARM_ALU_SB_G0", //71 Static ARM ((S + A) | T) ? B(S)109 "R_ARM_ALU_SB_G1_NC", //72 Static ARM ((S + A) | T) ? B(S)110 "R_ARM_ALU_SB_G1", //73 Static ARM ((S + A) | T) ? B(S)111 "R_ARM_ALU_SB_G2", //74 Static ARM ((S + A) | T) ? B(S)112 "R_ARM_LDR_SB_G0", //75 Static ARM S + A ? B(S)113 "R_ARM_LDR_SB_G1", //76 Static ARM S + A ? B(S)114 "R_ARM_LDR_SB_G2", //77 Static ARM S + A ? B(S)115 "R_ARM_LDRS_SB_G0", //78 Static ARM S + A ? B(S)116 "R_ARM_LDRS_SB_G1", //79 Static ARM S + A ? B(S)117 "R_ARM_LDRS_SB_G2", //80 Static ARM S + A ? B(S)118 "R_ARM_LDC_SB_G0", //81 Static ARM S + A ? B(S)119 "R_ARM_LDC_SB_G1", //82 Static ARM S + A ? B(S)120 "R_ARM_LDC_SB_G2", //83 Static ARM S + A ? B(S)121 "R_ARM_MOVW_BREL_NC", //84 Static ARM ((S + A) | T) ? B(S)122 "R_ARM_MOVT_BREL", //85 Static ARM S + A ? B(S)123 "R_ARM_MOVW_BREL", //86 Static ARM ((S + A) | T) ? B(S)124 "R_ARM_THM_MOVW_BREL_NC", //87 Static Thumb32 ((S + A) | T) ? B(S)125 "R_ARM_THM_MOVT_BREL", //88 Static Thumb32 S + A ? B(S)126 "R_ARM_THM_MOVW_BREL", //89 Static Thumb32 ((S + A) | T) ? B(S)127 "R_ARM_TLS_GOTDESC", //90 Static Data128 "R_ARM_TLS_CALL", //91 Static ARM129 "R_ARM_TLS_DESCSEQ", //92 Static ARM TLS relaxation130 "R_ARM_THM_TLS_CALL", //93 Static Thumb32131 "R_ARM_PLT32_ABS", //94 Static Data PLT(S) + A132 "R_ARM_GOT_ABS", //95 Static Data GOT(S) + A133 "R_ARM_GOT_PREL", //96 Static Data GOT(S) + A ? P134 "R_ARM_GOT_BREL12", //97 Static ARM GOT(S) + A ? GOT_ORG135 "R_ARM_GOTOFF12", //98 Static ARM S + A ? GOT_ORG136 "R_ARM_GOTRELAX", //99 Static Miscellaneous137 "R_ARM_GNU_VTENTRY", //100 Deprecated Data ???138 "R_ARM_GNU_VTINHERIT", //101 Deprecated Data ???139 "R_ARM_THM_JUMP11", //102 Static Thumb16 S + A ? P140 "R_ARM_THM_JUMP8", //103 Static Thumb16 S + A ? P141 "R_ARM_TLS_GD32", //104 Static Data GOT(S) + A ? P142 "R_ARM_TLS_LDM32", //105 Static Data GOT(S) + A ? P143 "R_ARM_TLS_LDO32", //106 Static Data S + A ? TLS144 "R_ARM_TLS_IE32", //107 Static Data GOT(S) + A ? P145 "R_ARM_TLS_LE32", //108 Static Data S + A ? tp146 "R_ARM_TLS_LDO12", //109 Static ARM S + A ? TLS147 "R_ARM_TLS_LE12", //110 Static ARM S + A ? tp148 "R_ARM_TLS_IE12GP", //111 Static ARM GOT(S) + A ? GOT_ORG37 "R_ARM_NONE", //0 Static Miscellaneous 38 "R_ARM_PC24", //1 Deprecated ARM ((S + A) | T) ? P 39 "R_ARM_ABS32", //2 Static Data (S + A) | T 40 "R_ARM_REL32", //3 Static Data ((S + A) | T) ? P 41 "R_ARM_LDR_PC_G0", //4 Static ARM S + A ? P 42 "R_ARM_ABS16", //5 Static Data S + A 43 "R_ARM_ABS12", //6 Static ARM S + A 44 "R_ARM_THM_ABS5", //7 Static Thumb16 S + A 45 "R_ARM_ABS8", //8 Static Data S + A 46 "R_ARM_SBREL32", //9 Static Data ((S + A) | T) ? B(S) 47 "R_ARM_THM_CALL", //10 Static Thumb32 ((S + A) | T) ? P 48 "R_ARM_THM_PC8", //11 Static Thumb16 S + A ? Pa 49 "R_ARM_BREL_ADJ", //12 Dynamic Data ?B(S) + A 50 "R_ARM_TLS_DESC", //13 Dynamic Data 51 "R_ARM_THM_SWI8", //14 Obsolete 52 "R_ARM_XPC25", //15 Obsolete 53 "R_ARM_THM_XPC22", //16 Obsolete Encodings reserved for future Dynamic relocations 54 "R_ARM_TLS_DTPMOD32", //17 Dynamic Data Module[S] 55 "R_ARM_TLS_DTPOFF32", //18 Dynamic Data S + A ? TLS 56 "R_ARM_TLS_TPOFF32", //19 Dynamic Data S + A ? tp 57 "R_ARM_COPY", //20 Dynamic Miscellaneous 58 "R_ARM_GLOB_DAT", //21 Dynamic Data (S + A) | T 59 "R_ARM_JUMP_SLOT", //22 Dynamic Data (S + A) | T 60 "R_ARM_RELATIVE", //23 Dynamic Data B(S) + A [Note: see Table 4-16] 61 "R_ARM_GOTOFF32", //24 Static Data ((S + A) | T) ? GOT_ORG 62 "R_ARM_BASE_PREL", //25 Static Data B(S) + A ? P 63 "R_ARM_GOT_BREL", //26 Static Data GOT(S) + A ? GOT_ORG 64 "R_ARM_PLT32", //27 Deprecated ARM ((S + A) | T) ? P 65 "R_ARM_CALL", //28 Static ARM ((S + A) | T) ? P 66 "R_ARM_JUMP24", //29 Static ARM ((S + A) | T) ? P 67 "R_ARM_THM_JUMP24", //30 Static Thumb32 ((S + A) | T) ? P 68 "R_ARM_BASE_ABS", //31 Static Data B(S) + A 69 "R_ARM_ALU_PCREL_7_0", //32 Obsolete 70 "R_ARM_ALU_PCREL_15_8", //33 Obsolete 71 "R_ARM_ALU_PCREL_23_15", //34 Obsolete Note ? Legacy (ARM ELF B02) names have been retained for these obsolete relocations. 72 "R_ARM_LDR_SBREL_11_0_NC", //35 Deprecated ARM S + A ? B(S) 73 "R_ARM_ALU_SBREL_19_12_NC", //36 Deprecated ARM S + A ? B(S) 74 "R_ARM_ALU_SBREL_27_20_CK", //37 Deprecated ARM S + A ? B(S) 75 "R_ARM_TARGET1", //38 Static Miscellaneous (S + A) | T or ((S + A) | T) ? P 76 "R_ARM_SBREL31", //39 Deprecated Data ((S + A) | T) ? B(S) 77 "R_ARM_V4BX", //40 Static Miscellaneous 78 "R_ARM_TARGET2", //41 Static Miscellaneous 79 "R_ARM_PREL31", //42 Static Data ((S + A) | T) ? P 80 "R_ARM_MOVW_ABS_NC", //43 Static ARM (S + A) | T 81 "R_ARM_MOVT_ABS", //44 Static ARM S + A 82 "R_ARM_MOVW_PREL_NC", //45 Static ARM ((S + A) | T) ? P 83 "R_ARM_MOVT_PREL", //46 Static ARM S + A ? P 84 "R_ARM_THM_MOVW_ABS_NC", //47 Static Thumb32 (S + A) | T 85 "R_ARM_THM_MOVT_ABS", //48 Static Thumb32 S + A 86 "R_ARM_THM_MOVW_PREL_NC", //49 Static Thumb32 ((S + A) | T) ? P 87 "R_ARM_THM_MOVT_PREL", //50 Static Thumb32 S + A ? P 88 "R_ARM_THM_JUMP19", //51 Static Thumb32 ((S + A) | T) ? P 89 "R_ARM_THM_JUMP6", //52 Static Thumb16 S + A ? P 90 "R_ARM_THM_ALU_PREL_11_0", //53 Static Thumb32 ((S + A) | T) ? Pa 91 "R_ARM_THM_PC12", //54 Static Thumb32 S + A ? Pa 92 "R_ARM_ABS32_NOI", //55 Static Data S + A 93 "R_ARM_REL32_NOI", //56 Static Data S + A ? P 94 "R_ARM_ALU_PC_G0_NC", //57 Static ARM ((S + A) | T) ? P 95 "R_ARM_ALU_PC_G0", //58 Static ARM ((S + A) | T) ? P 96 "R_ARM_ALU_PC_G1_NC", //59 Static ARM ((S + A) | T) ? P 97 "R_ARM_ALU_PC_G1", //60 Static ARM ((S + A) | T) ? P 98 "R_ARM_ALU_PC_G2", //61 Static ARM ((S + A) | T) ? P 99 "R_ARM_LDR_PC_G1", //62 Static ARM S + A ? P 100 "R_ARM_LDR_PC_G2", //63 Static ARM S + A ? P 101 "R_ARM_LDRS_PC_G0", //64 Static ARM S + A ? P 102 "R_ARM_LDRS_PC_G1", //65 Static ARM S + A ? P 103 "R_ARM_LDRS_PC_G2", //66 Static ARM S + A ? P 104 "R_ARM_LDC_PC_G0", //67 Static ARM S + A ? P 105 "R_ARM_LDC_PC_G1", //68 Static ARM S + A ? P 106 "R_ARM_LDC_PC_G2", //69 Static ARM S + A ? P 107 "R_ARM_ALU_SB_G0_NC", //70 Static ARM ((S + A) | T) ? B(S) 108 "R_ARM_ALU_SB_G0", //71 Static ARM ((S + A) | T) ? B(S) 109 "R_ARM_ALU_SB_G1_NC", //72 Static ARM ((S + A) | T) ? B(S) 110 "R_ARM_ALU_SB_G1", //73 Static ARM ((S + A) | T) ? B(S) 111 "R_ARM_ALU_SB_G2", //74 Static ARM ((S + A) | T) ? B(S) 112 "R_ARM_LDR_SB_G0", //75 Static ARM S + A ? B(S) 113 "R_ARM_LDR_SB_G1", //76 Static ARM S + A ? B(S) 114 "R_ARM_LDR_SB_G2", //77 Static ARM S + A ? B(S) 115 "R_ARM_LDRS_SB_G0", //78 Static ARM S + A ? B(S) 116 "R_ARM_LDRS_SB_G1", //79 Static ARM S + A ? B(S) 117 "R_ARM_LDRS_SB_G2", //80 Static ARM S + A ? B(S) 118 "R_ARM_LDC_SB_G0", //81 Static ARM S + A ? B(S) 119 "R_ARM_LDC_SB_G1", //82 Static ARM S + A ? B(S) 120 "R_ARM_LDC_SB_G2", //83 Static ARM S + A ? B(S) 121 "R_ARM_MOVW_BREL_NC", //84 Static ARM ((S + A) | T) ? B(S) 122 "R_ARM_MOVT_BREL", //85 Static ARM S + A ? B(S) 123 "R_ARM_MOVW_BREL", //86 Static ARM ((S + A) | T) ? B(S) 124 "R_ARM_THM_MOVW_BREL_NC", //87 Static Thumb32 ((S + A) | T) ? B(S) 125 "R_ARM_THM_MOVT_BREL", //88 Static Thumb32 S + A ? B(S) 126 "R_ARM_THM_MOVW_BREL", //89 Static Thumb32 ((S + A) | T) ? B(S) 127 "R_ARM_TLS_GOTDESC", //90 Static Data 128 "R_ARM_TLS_CALL", //91 Static ARM 129 "R_ARM_TLS_DESCSEQ", //92 Static ARM TLS relaxation 130 "R_ARM_THM_TLS_CALL", //93 Static Thumb32 131 "R_ARM_PLT32_ABS", //94 Static Data PLT(S) + A 132 "R_ARM_GOT_ABS", //95 Static Data GOT(S) + A 133 "R_ARM_GOT_PREL", //96 Static Data GOT(S) + A ? P 134 "R_ARM_GOT_BREL12", //97 Static ARM GOT(S) + A ? GOT_ORG 135 "R_ARM_GOTOFF12", //98 Static ARM S + A ? GOT_ORG 136 "R_ARM_GOTRELAX", //99 Static Miscellaneous 137 "R_ARM_GNU_VTENTRY", //100 Deprecated Data ??? 138 "R_ARM_GNU_VTINHERIT", //101 Deprecated Data ??? 139 "R_ARM_THM_JUMP11", //102 Static Thumb16 S + A ? P 140 "R_ARM_THM_JUMP8", //103 Static Thumb16 S + A ? P 141 "R_ARM_TLS_GD32", //104 Static Data GOT(S) + A ? P 142 "R_ARM_TLS_LDM32", //105 Static Data GOT(S) + A ? P 143 "R_ARM_TLS_LDO32", //106 Static Data S + A ? TLS 144 "R_ARM_TLS_IE32", //107 Static Data GOT(S) + A ? P 145 "R_ARM_TLS_LE32", //108 Static Data S + A ? tp 146 "R_ARM_TLS_LDO12", //109 Static ARM S + A ? TLS 147 "R_ARM_TLS_LE12", //110 Static ARM S + A ? tp 148 "R_ARM_TLS_IE12GP", //111 Static ARM GOT(S) + A ? GOT_ORG 149 149 }; 150 150 #endif 151 151 -
src/system/kernel/arch/arm/arch_int.cpp
diff --git a/src/system/kernel/arch/arm/arch_int.cpp b/src/system/kernel/arch/arm/arch_int.cpp index 5c37f36..760d4be 100644
a b arch_int_init_post_vm(kernel_args *args) 142 142 B_READ_AREA | B_EXECUTE_AREA, sVectorPageArea); 143 143 144 144 if (sUserVectorPageArea < 0) 145 panic("user vector page @ %p could not be created (%lx)!", sVectorPageAddress, sUserVectorPageArea); 145 panic("user vector page @ %p could not be created (%lx)!", 146 sVectorPageAddress, sUserVectorPageArea); 146 147 147 148 // copy vectors into the newly created area 148 149 memcpy(sVectorPageAddress, &_vectors_start, VECTORPAGE_SIZE); … … arch_int_init_post_vm(kernel_args *args) 162 163 } 163 164 164 165 sPxaInterruptArea = map_physical_memory("pxa_intc", PXA_INTERRUPT_PHYS_BASE, 165 PXA_INTERRUPT_SIZE, 0, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, (void**)&sPxaInterruptBase); 166 PXA_INTERRUPT_SIZE, 0, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, 167 (void**)&sPxaInterruptBase); 166 168 167 169 if (sPxaInterruptArea < 0) 168 170 return sPxaInterruptArea; … … arch_int_init_post_device_manager(struct kernel_args *args) 188 190 } 189 191 190 192 191 extern "C" void arch_arm_undefined(struct iframe *iframe) 193 extern "C" void 194 arch_arm_undefined(struct iframe *iframe) 192 195 { 193 196 print_iframe("Undefined Instruction", iframe); 194 197 panic("not handled!"); 195 198 } 196 199 197 extern "C" void arch_arm_syscall(struct iframe *iframe) 200 201 extern "C" void 202 arch_arm_syscall(struct iframe *iframe) 198 203 { 199 204 print_iframe("Software interrupt", iframe); 200 205 } 201 206 202 extern "C" void arch_arm_data_abort(struct iframe *frame) 207 208 extern "C" void 209 arch_arm_data_abort(struct iframe *frame) 203 210 { 204 211 Thread *thread = thread_get_current_thread(); 205 212 bool isUser = (frame->spsr & 0x1f) == 0x10; … … extern "C" void arch_arm_data_abort(struct iframe *frame) 281 288 } 282 289 } 283 290 284 extern "C" void arch_arm_prefetch_abort(struct iframe *iframe) 291 extern "C" void 292 arch_arm_prefetch_abort(struct iframe *iframe) 285 293 { 286 294 print_iframe("Prefetch Abort", iframe); 287 295 panic("not handled!"); 288 296 } 289 297 290 extern "C" void arch_arm_irq(struct iframe *iframe) 298 extern "C" void 299 arch_arm_irq(struct iframe *iframe) 291 300 { 292 301 for (int i=0; i < 32; i++) 293 302 if (sPxaInterruptBase[PXA_ICIP] & (1 << i)) 294 303 int_io_interrupt_handler(i, true); 295 304 } 296 305 297 extern "C" void arch_arm_fiq(struct iframe *iframe) 306 extern "C" void 307 arch_arm_fiq(struct iframe *iframe) 298 308 { 299 309 for (int i=0; i < 32; i++) 300 310 if (sPxaInterruptBase[PXA_ICIP] & (1 << i)) -
src/system/kernel/arch/arm/arch_timer.cpp
diff --git a/src/system/kernel/arch/arm/arch_timer.cpp b/src/system/kernel/arch/arm/arch_timer.cpp index 5cf8574..3899cc0 100644
a b static int32 47 47 pxa_timer_interrupt(void *data) 48 48 { 49 49 int32 ret = timer_interrupt(); 50 50 sPxaTimersBase[PXA_OSSR] |= (1 << 4); 51 51 52 52 return ret; 53 53 } 54 54 55 55 … … int 83 83 arch_init_timer(kernel_args *args) 84 84 { 85 85 sPxaTimersArea = map_physical_memory("pxa_timers", PXA_TIMERS_PHYS_BASE, 86 PXA_TIMERS_SIZE, 0, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, (void**)&sPxaTimersBase); 86 PXA_TIMERS_SIZE, 0, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, 87 (void**)&sPxaTimersBase); 87 88 88 89 if (sPxaTimersArea < 0) 89 90 return sPxaTimersArea; 90 91 91 92 sPxaTimersBase[PXA_OMCR4] = 0; // disable our timer 92 93 93 install_io_interrupt_handler(PXA_TIMERS_INTERRUPT, &pxa_timer_interrupt, NULL, 0); 94 install_io_interrupt_handler(PXA_TIMERS_INTERRUPT, &pxa_timer_interrupt, 95 NULL, 0); 94 96 95 97 return B_OK; 96 98 } -
src/system/kernel/arch/arm/arch_uart_8250.cpp
diff --git a/src/system/kernel/arch/arm/arch_uart_8250.cpp b/src/system/kernel/arch/arm/arch_uart_8250.cpp index a2efda5..262ce65 100644
a b public: 27 27 28 28 29 29 ArchUART8250::ArchUART8250(addr_t base, int64 clock) 30 : DebugUART8250(base, clock) 30 : 31 DebugUART8250(base, clock) 31 32 { 32 33 } 33 34 -
src/system/kernel/arch/arm/arch_uart_pl011.cpp
diff --git a/src/system/kernel/arch/arm/arch_uart_pl011.cpp b/src/system/kernel/arch/arm/arch_uart_pl011.cpp index 0794324..bc8af21 100644
a b 148 148 149 149 150 150 ArchUARTPL011::ArchUARTPL011(addr_t base, int64 clock) 151 : DebugUART(base, clock) 151 : 152 DebugUART(base, clock) 152 153 { 153 154 Barrier(); 154 155 -
src/system/kernel/arch/arm/arch_vm_translation_map.cpp
diff --git a/src/system/kernel/arch/arm/arch_vm_translation_map.cpp b/src/system/kernel/arch/arm/arch_vm_translation_map.cpp index faad4bf..677fece 100644
a b static union { 29 29 uint64 align; 30 30 char thirty_two[sizeof(ARMPagingMethod32Bit)]; 31 31 #if B_HAIKU_PHYSICAL_BITS == 64 32 char pae[sizeof(ARMPagingMethodPAE)];32 char pae[sizeof(ARMPagingMethodPAE)]; 33 33 #endif 34 34 } sPagingMethodBuffer; 35 35 -
src/system/kernel/arch/arm/paging/ARMPagingMethod.h
diff --git a/src/system/kernel/arch/arm/paging/ARMPagingMethod.h b/src/system/kernel/arch/arm/paging/ARMPagingMethod.h index 570b639..852f64b 100644
a b public: 31 31 phys_addr_t physicalAddress, 32 32 uint8 attributes, 33 33 phys_addr_t (*get_free_page)(kernel_args*)) 34 34 = 0; 35 35 36 36 virtual bool IsKernelPageAccessible(addr_t virtualAddress, 37 37 uint32 protection) = 0; -
src/system/kernel/arch/generic/debug_uart_8250.cpp
diff --git a/src/system/kernel/arch/generic/debug_uart_8250.cpp b/src/system/kernel/arch/generic/debug_uart_8250.cpp index 39ac561..5ba6c1d 100644
a b 27 27 28 28 29 29 DebugUART8250::DebugUART8250(addr_t base, int64 clock) 30 : DebugUART(base, clock) 30 : 31 DebugUART(base, clock) 31 32 { 32 33 } 33 34 … … DebugUART8250::~DebugUART8250() 36 37 { 37 38 } 38 39 40 39 41 #define UART_RHR 0 40 42 #define UART_THR 0 41 43 #define UART_DLL 0 -
src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp
diff --git a/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp b/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp index 9473a55..d68f2f4 100644
a b generic_put_physical_page(addr_t va) 145 145 desc = virtual_pmappings[va / sIOSpaceChunkSize]; 146 146 if (desc == NULL) { 147 147 mutex_unlock(&sMutex); 148 panic("put_physical_page called on page at va 0x%lx which is not checked out\n", va); 148 panic("put_physical_page called on page at va 0x%lx which is not checked out\n", 149 va); 149 150 return B_ERROR; 150 151 } 151 152 -
src/tests/add-ons/index_server/fulltext_search/BeaconSearcher.h
diff --git a/src/tests/add-ons/index_server/fulltext_search/BeaconSearcher.h b/src/tests/add-ons/index_server/fulltext_search/BeaconSearcher.h index ea47a82..9bf00b9 100755
a b using namespace lucene::analysis::standard ; 23 23 24 24 class BeaconSearcher { 25 25 public: 26 BeaconSearcher() ;27 ~BeaconSearcher() ;28 wchar_t* GetNextHit() ;29 void Search(const char* query) ;26 BeaconSearcher() ; 27 ~BeaconSearcher() ; 28 wchar_t* GetNextHit() ; 29 void Search(const char* query) ; 30 30 31 31 private: 32 32 BPath GetIndexPath(BVolume *volume); -
src/tests/add-ons/kernel/bus_managers/agp_gart/gart_tester.cpp
diff --git a/src/tests/add-ons/kernel/bus_managers/agp_gart/gart_tester.cpp b/src/tests/add-ons/kernel/bus_managers/agp_gart/gart_tester.cpp index 1bc13f1..8e01c20 100644
a b test_gart() 181 181 182 182 addr_t base[5], physical[5]; 183 183 allocate(aperture, 2 * B_PAGE_SIZE, 0, 0, base[0], physical[0]); 184 allocate(aperture, 4 * B_PAGE_SIZE, 0, B_APERTURE_NON_RESERVED, base[1], physical[1]); 185 allocate(aperture, 1 * B_PAGE_SIZE, 0, B_APERTURE_NEED_PHYSICAL, base[2], physical[2]); 184 allocate(aperture, 4 * B_PAGE_SIZE, 0, B_APERTURE_NON_RESERVED, base[1], 185 physical[1]); 186 allocate(aperture, 1 * B_PAGE_SIZE, 0, B_APERTURE_NEED_PHYSICAL, base[2], 187 physical[2]); 186 188 sGART->deallocate_memory(aperture, base[2]); 187 allocate(aperture, 1 * B_PAGE_SIZE, 4 * B_PAGE_SIZE, 0, base[2], physical[2]); 189 allocate(aperture, 1 * B_PAGE_SIZE, 4 * B_PAGE_SIZE, 0, base[2], 190 physical[2]); 188 191 189 192 sGART->deallocate_memory(aperture, base[1]); 190 193 -
src/tests/add-ons/kernel/busses/scsi/example/example_scsi.c
diff --git a/src/tests/add-ons/kernel/busses/scsi/example/example_scsi.c b/src/tests/add-ons/kernel/busses/scsi/example/example_scsi.c index 47b0a59..9612960 100644
a b example_ioctl(scsi_sim_cookie cookie, uint8 targetID, uint32 op, void *buffer, 174 174 // module management 175 175 module_dependency module_dependencies[] = { 176 176 { SCSI_FOR_SIM_MODULE_NAME, (module_info **)&sSimInterface }, 177 { B_DEVICE_MANAGER_MODULE_NAME, (module_info **)&sDeviceManager },178 {}177 { B_DEVICE_MANAGER_MODULE_NAME, (module_info **)&sDeviceManager }, 178 {} 179 179 }; 180 180 181 181 -
src/tests/add-ons/kernel/drivers/tty/tty-test.cpp
diff --git a/src/tests/add-ons/kernel/drivers/tty/tty-test.cpp b/src/tests/add-ons/kernel/drivers/tty/tty-test.cpp index b162e70..e1b89c4 100644
a b open_tty(int index, bool master) 407 407 int fd = open(path, O_RDWR | (master ? 0 : O_NOCTTY)); 408 408 409 409 if (fd < 0) { 410 fprintf(stderr, "Failed to open tty `%s': %s\n", path, strerror(errno)); 410 fprintf(stderr, "Failed to open tty `%s': %s\n", path, 411 strerror(errno)); 411 412 exit(1); 412 413 } 413 414 … … close_tty(int &fd) 431 432 class TestUnblockOnCloseRead : public TestCase { 432 433 public: 433 434 TestUnblockOnCloseRead(bool master, bool crossOver) 434 : fMaster(-1), 435 fSlave(-1), 436 fTestMaster(master), 437 fCrossOver(crossOver) 435 : 436 fMaster(-1), 437 fSlave(-1), 438 fTestMaster(master), 439 fCrossOver(crossOver) 438 440 { 439 441 printf("TestUnblockOnCloseRead(%d, %d)\n", master, crossOver); 440 442 } … … private: 491 493 class TestUnblockOnCloseWrite : public TestCase { 492 494 public: 493 495 TestUnblockOnCloseWrite(bool master, bool crossOver, bool echo) 494 : fMaster(-1), 495 fSlave(-1), 496 fTestMaster(master), 497 fCrossOver(crossOver), 498 fEcho(echo) 496 : 497 fMaster(-1), 498 fSlave(-1), 499 fTestMaster(master), 500 fCrossOver(crossOver), 501 fEcho(echo) 499 502 { 500 503 printf("TestUnblockOnCloseWrite(%d, %d, %d)\n", master, crossOver, 501 504 echo); … … private: 560 563 class TestSelectAlreadyReady : public TestCase { 561 564 public: 562 565 TestSelectAlreadyReady(bool master, bool write) 563 : fMaster(-1), 564 fSlave(-1), 565 fTestMaster(master), 566 fWrite(write) 566 : 567 fMaster(-1), 568 fSlave(-1), 569 fTestMaster(master), 570 fWrite(write) 567 571 { 568 572 printf("TestSelectAlreadyReady(%d, %d)\n", master, write); 569 573 } … … private: 694 698 class TestSelectNotifyAfterPending : public TestCase { 695 699 public: 696 700 TestSelectNotifyAfterPending(bool master, bool write, bool unblock) 697 : fMaster(-1), 698 fSlave(-1), 699 fTestMaster(master), 700 fWrite(write), 701 fUnblock(unblock) 701 : 702 fMaster(-1), 703 fSlave(-1), 704 fTestMaster(master), 705 fWrite(write), 706 fUnblock(unblock) 702 707 { 703 708 printf("TestSelectNotifyAfterPending(%d, %d, %d)\n", master, write, 704 709 unblock); … … private: 808 813 class TestIoctlFIONRead : public TestCase { 809 814 public: 810 815 TestIoctlFIONRead(bool master) 811 : fMaster(-1), 812 fSlave(-1), 813 fTestMaster(master) 816 : 817 fMaster(-1), 818 fSlave(-1), 819 fTestMaster(master) 814 820 { 815 821 printf("TestIoctlFIONRead(%d)\n", master); 816 822 } … … protected: 835 841 errno = 0; 836 842 err = ioctl(fd, FIONREAD, NULL); 837 843 CHK(err == -1); 838 printf("e: %s\n", strerror(errno));844 printf("e: %s\n", strerror(errno)); 839 845 // should be CHK(errno == EINVAL); !! 840 846 CHK(errno == EFAULT); 841 847 842 848 errno = 0; 843 849 err = ioctl(fd, FIONREAD, (void *)1); 844 850 CHK(err == -1); 845 printf("e: %s\n", strerror(errno));851 printf("e: %s\n", strerror(errno)); 846 852 CHK(errno == EFAULT); 847 853 848 854 errno = 0; 849 855 850 856 err = ioctl(fd, FIONREAD, &toRead); 851 printf("e: %s\n", strerror(errno));857 printf("e: %s\n", strerror(errno)); 852 858 //CHK(err == 0); 853 859 //CHK(toRead == 0); 854 860 … … printf("e: %s\n", strerror(errno)); 857 863 errno = 0; 858 864 859 865 err = ioctl(fd, FIONREAD, &toRead); 860 printf("e: %d\n", err);866 printf("e: %d\n", err); 861 867 CHK(err == 0); 862 868 CHK(toRead == 1); 863 869