Skip to content

Commit 4fde94f

Browse files
jinge90jinge90
committed
[libunwind][NFC] Fix typo in libunwind debug string
Reviewed By: mstorsjo Differential Revision: https://reviews.llvm.org/D137529 Signed-off-by: jinge90 <[email protected]>
1 parent d20c54c commit 4fde94f

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎libunwind/src/UnwindLevel1.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ unwind_phase1(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
8484
int stepResult = __unw_step(cursor);
8585
if (stepResult == 0) {
8686
_LIBUNWIND_TRACE_UNWINDING(
87-
"unwind_phase1(ex_ojb=%p): __unw_step() reached "
87+
"unwind_phase1(ex_obj=%p): __unw_step() reached "
8888
"bottom => _URC_END_OF_STACK",
8989
(void *)exception_object);
9090
return _URC_END_OF_STACK;
9191
} else if (stepResult < 0) {
9292
_LIBUNWIND_TRACE_UNWINDING(
93-
"unwind_phase1(ex_ojb=%p): __unw_step failed => "
93+
"unwind_phase1(ex_obj=%p): __unw_step failed => "
9494
"_URC_FATAL_PHASE1_ERROR",
9595
(void *)exception_object);
9696
return _URC_FATAL_PHASE1_ERROR;
@@ -101,7 +101,7 @@ unwind_phase1(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
101101
unw_word_t sp;
102102
if (__unw_get_proc_info(cursor, &frameInfo) != UNW_ESUCCESS) {
103103
_LIBUNWIND_TRACE_UNWINDING(
104-
"unwind_phase1(ex_ojb=%p): __unw_get_proc_info "
104+
"unwind_phase1(ex_obj=%p): __unw_get_proc_info "
105105
"failed => _URC_FATAL_PHASE1_ERROR",
106106
(void *)exception_object);
107107
return _URC_FATAL_PHASE1_ERROR;
@@ -120,7 +120,7 @@ unwind_phase1(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
120120
unw_word_t pc;
121121
__unw_get_reg(cursor, UNW_REG_IP, &pc);
122122
_LIBUNWIND_TRACE_UNWINDING(
123-
"unwind_phase1(ex_ojb=%p): pc=0x%" PRIxPTR ", start_ip=0x%" PRIxPTR
123+
"unwind_phase1(ex_obj=%p): pc=0x%" PRIxPTR ", start_ip=0x%" PRIxPTR
124124
", func=%s, lsda=0x%" PRIxPTR ", personality=0x%" PRIxPTR "",
125125
(void *)exception_object, pc, frameInfo.start_ip, functionName,
126126
frameInfo.lsda, frameInfo.handler);
@@ -133,7 +133,7 @@ unwind_phase1(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
133133
_Unwind_Personality_Fn p =
134134
(_Unwind_Personality_Fn)(uintptr_t)(frameInfo.handler);
135135
_LIBUNWIND_TRACE_UNWINDING(
136-
"unwind_phase1(ex_ojb=%p): calling personality function %p",
136+
"unwind_phase1(ex_obj=%p): calling personality function %p",
137137
(void *)exception_object, (void *)(uintptr_t)p);
138138
_Unwind_Reason_Code personalityResult =
139139
(*p)(1, _UA_SEARCH_PHASE, exception_object->exception_class,
@@ -145,21 +145,21 @@ unwind_phase1(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
145145
__unw_get_reg(cursor, UNW_REG_SP, &sp);
146146
exception_object->private_2 = (uintptr_t)sp;
147147
_LIBUNWIND_TRACE_UNWINDING(
148-
"unwind_phase1(ex_ojb=%p): _URC_HANDLER_FOUND",
148+
"unwind_phase1(ex_obj=%p): _URC_HANDLER_FOUND",
149149
(void *)exception_object);
150150
return _URC_NO_REASON;
151151

152152
case _URC_CONTINUE_UNWIND:
153153
_LIBUNWIND_TRACE_UNWINDING(
154-
"unwind_phase1(ex_ojb=%p): _URC_CONTINUE_UNWIND",
154+
"unwind_phase1(ex_obj=%p): _URC_CONTINUE_UNWIND",
155155
(void *)exception_object);
156156
// continue unwinding
157157
break;
158158

159159
default:
160160
// something went wrong
161161
_LIBUNWIND_TRACE_UNWINDING(
162-
"unwind_phase1(ex_ojb=%p): _URC_FATAL_PHASE1_ERROR",
162+
"unwind_phase1(ex_obj=%p): _URC_FATAL_PHASE1_ERROR",
163163
(void *)exception_object);
164164
return _URC_FATAL_PHASE1_ERROR;
165165
}
@@ -173,7 +173,7 @@ static _Unwind_Reason_Code
173173
unwind_phase2(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *exception_object) {
174174
__unw_init_local(cursor, uc);
175175

176-
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_ojb=%p)",
176+
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_obj=%p)",
177177
(void *)exception_object);
178178

179179
// uc is initialized by __unw_getcontext in the parent frame. The first stack
@@ -190,13 +190,13 @@ unwind_phase2(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
190190
int stepResult = __unw_step_stage2(cursor);
191191
if (stepResult == 0) {
192192
_LIBUNWIND_TRACE_UNWINDING(
193-
"unwind_phase2(ex_ojb=%p): __unw_step_stage2() reached "
193+
"unwind_phase2(ex_obj=%p): __unw_step_stage2() reached "
194194
"bottom => _URC_END_OF_STACK",
195195
(void *)exception_object);
196196
return _URC_END_OF_STACK;
197197
} else if (stepResult < 0) {
198198
_LIBUNWIND_TRACE_UNWINDING(
199-
"unwind_phase2(ex_ojb=%p): __unw_step_stage2 failed => "
199+
"unwind_phase2(ex_obj=%p): __unw_step_stage2 failed => "
200200
"_URC_FATAL_PHASE1_ERROR",
201201
(void *)exception_object);
202202
return _URC_FATAL_PHASE2_ERROR;
@@ -208,7 +208,7 @@ unwind_phase2(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
208208
__unw_get_reg(cursor, UNW_REG_SP, &sp);
209209
if (__unw_get_proc_info(cursor, &frameInfo) != UNW_ESUCCESS) {
210210
_LIBUNWIND_TRACE_UNWINDING(
211-
"unwind_phase2(ex_ojb=%p): __unw_get_proc_info "
211+
"unwind_phase2(ex_obj=%p): __unw_get_proc_info "
212212
"failed => _URC_FATAL_PHASE1_ERROR",
213213
(void *)exception_object);
214214
return _URC_FATAL_PHASE2_ERROR;
@@ -224,7 +224,7 @@ unwind_phase2(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
224224
&offset) != UNW_ESUCCESS) ||
225225
(frameInfo.start_ip + offset > frameInfo.end_ip))
226226
functionName = ".anonymous.";
227-
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_ojb=%p): start_ip=0x%" PRIxPTR
227+
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_obj=%p): start_ip=0x%" PRIxPTR
228228
", func=%s, sp=0x%" PRIxPTR ", lsda=0x%" PRIxPTR
229229
", personality=0x%" PRIxPTR,
230230
(void *)exception_object, frameInfo.start_ip,
@@ -264,7 +264,7 @@ unwind_phase2(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
264264
case _URC_CONTINUE_UNWIND:
265265
// Continue unwinding
266266
_LIBUNWIND_TRACE_UNWINDING(
267-
"unwind_phase2(ex_ojb=%p): _URC_CONTINUE_UNWIND",
267+
"unwind_phase2(ex_obj=%p): _URC_CONTINUE_UNWIND",
268268
(void *)exception_object);
269269
if (sp == exception_object->private_2) {
270270
// Phase 1 said we would stop at this frame, but we did not...
@@ -274,15 +274,15 @@ unwind_phase2(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except
274274
break;
275275
case _URC_INSTALL_CONTEXT:
276276
_LIBUNWIND_TRACE_UNWINDING(
277-
"unwind_phase2(ex_ojb=%p): _URC_INSTALL_CONTEXT",
277+
"unwind_phase2(ex_obj=%p): _URC_INSTALL_CONTEXT",
278278
(void *)exception_object);
279279
// Personality routine says to transfer control to landing pad.
280280
// We may get control back if landing pad calls _Unwind_Resume().
281281
if (_LIBUNWIND_TRACING_UNWINDING) {
282282
unw_word_t pc;
283283
__unw_get_reg(cursor, UNW_REG_IP, &pc);
284284
__unw_get_reg(cursor, UNW_REG_SP, &sp);
285-
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_ojb=%p): re-entering "
285+
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_obj=%p): re-entering "
286286
"user code with ip=0x%" PRIxPTR
287287
", sp=0x%" PRIxPTR,
288288
(void *)exception_object, pc, sp);
@@ -321,7 +321,7 @@ unwind_phase2_forced(unw_context_t *uc, unw_cursor_t *cursor,
321321
unw_proc_info_t frameInfo;
322322
if (__unw_get_proc_info(cursor, &frameInfo) != UNW_ESUCCESS) {
323323
_LIBUNWIND_TRACE_UNWINDING(
324-
"unwind_phase2_forced(ex_ojb=%p): __unw_step_stage2 "
324+
"unwind_phase2_forced(ex_obj=%p): __unw_step_stage2 "
325325
"failed => _URC_END_OF_STACK",
326326
(void *)exception_object);
327327
return _URC_FATAL_PHASE2_ERROR;
@@ -338,7 +338,7 @@ unwind_phase2_forced(unw_context_t *uc, unw_cursor_t *cursor,
338338
(frameInfo.start_ip + offset > frameInfo.end_ip))
339339
functionName = ".anonymous.";
340340
_LIBUNWIND_TRACE_UNWINDING(
341-
"unwind_phase2_forced(ex_ojb=%p): start_ip=0x%" PRIxPTR
341+
"unwind_phase2_forced(ex_obj=%p): start_ip=0x%" PRIxPTR
342342
", func=%s, lsda=0x%" PRIxPTR ", personality=0x%" PRIxPTR,
343343
(void *)exception_object, frameInfo.start_ip, functionName,
344344
frameInfo.lsda, frameInfo.handler);
@@ -352,11 +352,11 @@ unwind_phase2_forced(unw_context_t *uc, unw_cursor_t *cursor,
352352
(*stop)(1, action, exception_object->exception_class, exception_object,
353353
(struct _Unwind_Context *)(cursor), stop_parameter);
354354
_LIBUNWIND_TRACE_UNWINDING(
355-
"unwind_phase2_forced(ex_ojb=%p): stop function returned %d",
355+
"unwind_phase2_forced(ex_obj=%p): stop function returned %d",
356356
(void *)exception_object, stopResult);
357357
if (stopResult != _URC_NO_REASON) {
358358
_LIBUNWIND_TRACE_UNWINDING(
359-
"unwind_phase2_forced(ex_ojb=%p): stopped by stop function",
359+
"unwind_phase2_forced(ex_obj=%p): stopped by stop function",
360360
(void *)exception_object);
361361
return _URC_FATAL_PHASE2_ERROR;
362362
}
@@ -367,21 +367,21 @@ unwind_phase2_forced(unw_context_t *uc, unw_cursor_t *cursor,
367367
_Unwind_Personality_Fn p =
368368
(_Unwind_Personality_Fn)(intptr_t)(frameInfo.handler);
369369
_LIBUNWIND_TRACE_UNWINDING(
370-
"unwind_phase2_forced(ex_ojb=%p): calling personality function %p",
370+
"unwind_phase2_forced(ex_obj=%p): calling personality function %p",
371371
(void *)exception_object, (void *)(uintptr_t)p);
372372
_Unwind_Reason_Code personalityResult =
373373
(*p)(1, action, exception_object->exception_class, exception_object,
374374
(struct _Unwind_Context *)(cursor));
375375
switch (personalityResult) {
376376
case _URC_CONTINUE_UNWIND:
377-
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2_forced(ex_ojb=%p): "
377+
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2_forced(ex_obj=%p): "
378378
"personality returned "
379379
"_URC_CONTINUE_UNWIND",
380380
(void *)exception_object);
381381
// Destructors called, continue unwinding
382382
break;
383383
case _URC_INSTALL_CONTEXT:
384-
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2_forced(ex_ojb=%p): "
384+
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2_forced(ex_obj=%p): "
385385
"personality returned "
386386
"_URC_INSTALL_CONTEXT",
387387
(void *)exception_object);
@@ -390,7 +390,7 @@ unwind_phase2_forced(unw_context_t *uc, unw_cursor_t *cursor,
390390
break;
391391
default:
392392
// Personality routine returned an unknown result code.
393-
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2_forced(ex_ojb=%p): "
393+
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2_forced(ex_obj=%p): "
394394
"personality returned %d, "
395395
"_URC_FATAL_PHASE2_ERROR",
396396
(void *)exception_object, personalityResult);
@@ -401,7 +401,7 @@ unwind_phase2_forced(unw_context_t *uc, unw_cursor_t *cursor,
401401

402402
// Call stop function one last time and tell it we've reached the end
403403
// of the stack.
404-
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2_forced(ex_ojb=%p): calling stop "
404+
_LIBUNWIND_TRACE_UNWINDING("unwind_phase2_forced(ex_obj=%p): calling stop "
405405
"function with _UA_END_OF_STACK",
406406
(void *)exception_object);
407407
_Unwind_Action lastAction =

0 commit comments

Comments
 (0)