Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit d8c14f5

Browse files
compnerdcompnerd
committed
DWARF: convert error logs to _LIBUNWIND_LOG
Use the `_LIBUNWIND_LOG` macro instead of the explicit `fprintf` call. NFC. git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@292721 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 24e592c commit d8c14f5

File tree

2 files changed

+17
-31
lines changed

2 files changed

+17
-31
lines changed

‎src/DwarfParser.hpp

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -421,8 +421,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
421421
offset = (int64_t)addressSpace.getULEB128(p, instructionsEnd)
422422
* cieInfo.dataAlignFactor;
423423
if (reg > kMaxRegisterNumber) {
424-
fprintf(stderr,
425-
"malformed DW_CFA_offset_extended DWARF unwind, reg too big\n");
424+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_offset_extended, reg too big");
426425
return false;
427426
}
428427
results->savedRegisters[reg].location = kRegisterInCFA;
@@ -436,9 +435,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
436435
reg = addressSpace.getULEB128(p, instructionsEnd);
437436
;
438437
if (reg > kMaxRegisterNumber) {
439-
fprintf(
440-
stderr,
441-
"malformed DW_CFA_restore_extended DWARF unwind, reg too big\n");
438+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_restore_extended, reg too big");
442439
return false;
443440
}
444441
results->savedRegisters[reg] = initialState.savedRegisters[reg];
@@ -448,8 +445,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
448445
case DW_CFA_undefined:
449446
reg = addressSpace.getULEB128(p, instructionsEnd);
450447
if (reg > kMaxRegisterNumber) {
451-
fprintf(stderr,
452-
"malformed DW_CFA_undefined DWARF unwind, reg too big\n");
448+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_undefined, reg too big");
453449
return false;
454450
}
455451
results->savedRegisters[reg].location = kRegisterUnused;
@@ -459,8 +455,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
459455
case DW_CFA_same_value:
460456
reg = addressSpace.getULEB128(p, instructionsEnd);
461457
if (reg > kMaxRegisterNumber) {
462-
fprintf(stderr,
463-
"malformed DW_CFA_same_value DWARF unwind, reg too big\n");
458+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_same_value, reg too big");
464459
return false;
465460
}
466461
// <rdar://problem/8456377> DW_CFA_same_value unsupported
@@ -477,13 +472,11 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
477472
reg = addressSpace.getULEB128(p, instructionsEnd);
478473
reg2 = addressSpace.getULEB128(p, instructionsEnd);
479474
if (reg > kMaxRegisterNumber) {
480-
fprintf(stderr,
481-
"malformed DW_CFA_register DWARF unwind, reg too big\n");
475+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_register, reg too big");
482476
return false;
483477
}
484478
if (reg2 > kMaxRegisterNumber) {
485-
fprintf(stderr,
486-
"malformed DW_CFA_register DWARF unwind, reg2 too big\n");
479+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_register, reg2 too big");
487480
return false;
488481
}
489482
results->savedRegisters[reg].location = kRegisterInRegister;
@@ -525,7 +518,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
525518
reg = addressSpace.getULEB128(p, instructionsEnd);
526519
offset = (int64_t)addressSpace.getULEB128(p, instructionsEnd);
527520
if (reg > kMaxRegisterNumber) {
528-
fprintf(stderr, "malformed DW_CFA_def_cfa DWARF unwind, reg too big\n");
521+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_def_cfa, reg too big");
529522
return false;
530523
}
531524
results->cfaRegister = (uint32_t)reg;
@@ -537,9 +530,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
537530
case DW_CFA_def_cfa_register:
538531
reg = addressSpace.getULEB128(p, instructionsEnd);
539532
if (reg > kMaxRegisterNumber) {
540-
fprintf(
541-
stderr,
542-
"malformed DW_CFA_def_cfa_register DWARF unwind, reg too big\n");
533+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_def_cfa_register, reg too big");
543534
return false;
544535
}
545536
results->cfaRegister = (uint32_t)reg;
@@ -567,8 +558,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
567558
case DW_CFA_expression:
568559
reg = addressSpace.getULEB128(p, instructionsEnd);
569560
if (reg > kMaxRegisterNumber) {
570-
fprintf(stderr,
571-
"malformed DW_CFA_expression DWARF unwind, reg too big\n");
561+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_expression, reg too big");
572562
return false;
573563
}
574564
results->savedRegisters[reg].location = kRegisterAtExpression;
@@ -583,9 +573,8 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
583573
case DW_CFA_offset_extended_sf:
584574
reg = addressSpace.getULEB128(p, instructionsEnd);
585575
if (reg > kMaxRegisterNumber) {
586-
fprintf(
587-
stderr,
588-
"malformed DW_CFA_offset_extended_sf DWARF unwind, reg too big\n");
576+
_LIBUNWIND_LOG(
577+
"malformed DWARF DW_CFA_offset_extended_sf, reg too big");
589578
return false;
590579
}
591580
offset =
@@ -602,8 +591,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
602591
offset =
603592
addressSpace.getSLEB128(p, instructionsEnd) * cieInfo.dataAlignFactor;
604593
if (reg > kMaxRegisterNumber) {
605-
fprintf(stderr,
606-
"malformed DW_CFA_def_cfa_sf DWARF unwind, reg too big\n");
594+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_def_cfa_sf, reg too big");
607595
return false;
608596
}
609597
results->cfaRegister = (uint32_t)reg;
@@ -635,8 +623,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
635623
case DW_CFA_val_offset_sf:
636624
reg = addressSpace.getULEB128(p, instructionsEnd);
637625
if (reg > kMaxRegisterNumber) {
638-
fprintf(stderr,
639-
"malformed DW_CFA_val_offset_sf DWARF unwind, reg too big\n");
626+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_val_offset_sf, reg too big");
640627
return false;
641628
}
642629
offset =
@@ -651,8 +638,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
651638
case DW_CFA_val_expression:
652639
reg = addressSpace.getULEB128(p, instructionsEnd);
653640
if (reg > kMaxRegisterNumber) {
654-
fprintf(stderr,
655-
"malformed DW_CFA_val_expression DWARF unwind, reg too big\n");
641+
_LIBUNWIND_LOG("malformed DWARF DW_CFA_val_expression, reg too big");
656642
return false;
657643
}
658644
results->savedRegisters[reg].location = kRegisterIsExpression;
@@ -673,8 +659,8 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
673659
case DW_CFA_GNU_negative_offset_extended:
674660
reg = addressSpace.getULEB128(p, instructionsEnd);
675661
if (reg > kMaxRegisterNumber) {
676-
fprintf(stderr, "malformed DW_CFA_GNU_negative_offset_extended DWARF "
677-
"unwind, reg too big\n");
662+
_LIBUNWIND_LOG(
663+
"malformed DWARF DW_CFA_GNU_negative_offset_extended, reg too big");
678664
return false;
679665
}
680666
offset = (int64_t)addressSpace.getULEB128(p, instructionsEnd)

‎src/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
} while (0)
8888

8989
#define _LIBUNWIND_LOG(msg, ...) \
90-
fprintf(stderr, "libunwind: " msg "\n", __VA_ARGS__)
90+
fprintf(stderr, "libunwind: " msg "\n", ##__VA_ARGS__)
9191

9292
#if defined(_LIBUNWIND_HAS_NO_THREADS)
9393
// only used with pthread calls, not needed for the single-threaded builds

0 commit comments

Comments
 (0)