UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ftrace/trivial: Clean up recordmcount.c to use Linux style comparisons 

The Linux ftrace subsystem style for comparing is:

  var == 1
  var > 0

and not:

  1 == var
  0 < var

It is considered that Linux developers are smart enough not to do the

  if (var = 1)

mistake.

Cc: John Reiser <jreiser@bitwagon.com>
Link: http://lkml.kernel.org/r/20110421023737.290712238@goodmis.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2011-04-06 13:21:17 -04:00 committed by Steven Rostedt
parent 449a66fd1f
commit dd5477ff3b
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
scripts/recordmcount.c
View File

@ -78,7 +78,7 @@ static off_t
ulseek(int const fd, off_t const offset, int const whence) ulseek(int const fd, off_t const offset, int const whence)
{ {
off_t const w = lseek(fd, offset, whence); off_t const w = lseek(fd, offset, whence);
if ((off_t)-1 == w) { if (w == (off_t)-1) {
perror("lseek"); perror("lseek");
fail_file(); fail_file();
} }
@ -111,7 +111,7 @@ static void *
umalloc(size_t size) umalloc(size_t size)
{ {
void *const addr = malloc(size); void *const addr = malloc(size);
if (0 == addr) { if (addr == 0) {
fprintf(stderr, "malloc failed: %zu bytes\n", size); fprintf(stderr, "malloc failed: %zu bytes\n", size);
fail_file(); fail_file();
} }
@ -136,7 +136,7 @@ static void *mmap_file(char const *fname)
void *addr; void *addr;
fd_map = open(fname, O_RDWR); fd_map = open(fname, O_RDWR);
if (0 > fd_map || 0 > fstat(fd_map, &sb)) { if (fd_map < 0 || fstat(fd_map, &sb) < 0) {
perror(fname); perror(fname);
fail_file(); fail_file();
} }
@ -147,7 +147,7 @@ static void *mmap_file(char const *fname)
addr = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, addr = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE,
fd_map, 0); fd_map, 0);
mmap_failed = 0; mmap_failed = 0;
if (MAP_FAILED == addr) { if (addr == MAP_FAILED) {
mmap_failed = 1; mmap_failed = 1;
addr = umalloc(sb.st_size); addr = umalloc(sb.st_size);
uread(fd_map, addr, sb.st_size); uread(fd_map, addr, sb.st_size);
@ -206,12 +206,12 @@ static uint32_t (*w2)(uint16_t);
static int static int
is_mcounted_section_name(char const *const txtname) is_mcounted_section_name(char const *const txtname)
{ {
return 0 == strcmp(".text", txtname) || return strcmp(".text", txtname) == 0 ||
0 == strcmp(".ref.text", txtname) || strcmp(".ref.text", txtname) == 0 ||
0 == strcmp(".sched.text", txtname) || strcmp(".sched.text", txtname) == 0 ||
0 == strcmp(".spinlock.text", txtname) || strcmp(".spinlock.text", txtname) == 0 ||
0 == strcmp(".irqentry.text", txtname) || strcmp(".irqentry.text", txtname) == 0 ||
0 == strcmp(".text.unlikely", txtname); strcmp(".text.unlikely", txtname) == 0;
} }
/* 32 bit and 64 bit are very similar */ /* 32 bit and 64 bit are very similar */
@ -270,7 +270,7 @@ do_file(char const *const fname)
fail_file(); fail_file();
} break; } break;
case ELFDATA2LSB: { case ELFDATA2LSB: {
if (1 != *(unsigned char const *)&endian) { if (*(unsigned char const *)&endian != 1) {
/* main() is big endian, file.o is little endian. */ /* main() is big endian, file.o is little endian. */
w = w4rev; w = w4rev;
w2 = w2rev; w2 = w2rev;
@ -278,7 +278,7 @@ do_file(char const *const fname)
} }
} break; } break;
case ELFDATA2MSB: { case ELFDATA2MSB: {
if (0 != *(unsigned char const *)&endian) { if (*(unsigned char const *)&endian != 0) {
/* main() is little endian, file.o is big endian. */ /* main() is little endian, file.o is big endian. */
w = w4rev; w = w4rev;
w2 = w2rev; w2 = w2rev;
@ -286,9 +286,9 @@ do_file(char const *const fname)
} }
} break; } break;
} /* end switch */ } /* end switch */
if (0 != memcmp(ELFMAG, ehdr->e_ident, SELFMAG) if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0
|| ET_REL != w2(ehdr->e_type) || w2(ehdr->e_type) != ET_REL
|| EV_CURRENT != ehdr->e_ident[EI_VERSION]) { || ehdr->e_ident[EI_VERSION] != EV_CURRENT) {
fprintf(stderr, "unrecognized ET_REL file %s\n", fname); fprintf(stderr, "unrecognized ET_REL file %s\n", fname);
fail_file(); fail_file();
} }
@ -321,15 +321,15 @@ do_file(char const *const fname)
fail_file(); fail_file();
} break; } break;
case ELFCLASS32: { case ELFCLASS32: {
if (sizeof(Elf32_Ehdr) != w2(ehdr->e_ehsize) if (w2(ehdr->e_ehsize) != sizeof(Elf32_Ehdr)
|| sizeof(Elf32_Shdr) != w2(ehdr->e_shentsize)) { || w2(ehdr->e_shentsize) != sizeof(Elf32_Shdr)) {
fprintf(stderr, fprintf(stderr,
"unrecognized ET_REL file: %s\n", fname); "unrecognized ET_REL file: %s\n", fname);
fail_file(); fail_file();
} }
if (EM_S390 == w2(ehdr->e_machine)) if (w2(ehdr->e_machine) == EM_S390)
reltype = R_390_32; reltype = R_390_32;
if (EM_MIPS == w2(ehdr->e_machine)) { if (w2(ehdr->e_machine) == EM_MIPS) {
reltype = R_MIPS_32; reltype = R_MIPS_32;
is_fake_mcount32 = MIPS32_is_fake_mcount; is_fake_mcount32 = MIPS32_is_fake_mcount;
} }
@ -337,15 +337,15 @@ do_file(char const *const fname)
} break; } break;
case ELFCLASS64: { case ELFCLASS64: {
Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr; Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
if (sizeof(Elf64_Ehdr) != w2(ghdr->e_ehsize) if (w2(ghdr->e_ehsize) != sizeof(Elf64_Ehdr)
|| sizeof(Elf64_Shdr) != w2(ghdr->e_shentsize)) { || w2(ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {
fprintf(stderr, fprintf(stderr,
"unrecognized ET_REL file: %s\n", fname); "unrecognized ET_REL file: %s\n", fname);
fail_file(); fail_file();
} }
if (EM_S390 == w2(ghdr->e_machine)) if (w2(ghdr->e_machine) == EM_S390)
reltype = R_390_64; reltype = R_390_64;
if (EM_MIPS == w2(ghdr->e_machine)) { if (w2(ghdr->e_machine) == EM_MIPS) {
reltype = R_MIPS_64; reltype = R_MIPS_64;
Elf64_r_sym = MIPS64_r_sym; Elf64_r_sym = MIPS64_r_sym;
Elf64_r_info = MIPS64_r_info; Elf64_r_info = MIPS64_r_info;
@ -371,7 +371,7 @@ main(int argc, char const *argv[])
} }
/* Process each file in turn, allowing deep failure. */ /* Process each file in turn, allowing deep failure. */
for (--argc, ++argv; 0 < argc; --argc, ++argv) { for (--argc, ++argv; argc > 0; --argc, ++argv) {
int const sjval = setjmp(jmpenv); int const sjval = setjmp(jmpenv);
int len; int len;

16
scripts/recordmcount.h
View File

@ -275,12 +275,12 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
Elf_Sym const *const symp = Elf_Sym const *const symp =
&sym0[Elf_r_sym(relp)]; &sym0[Elf_r_sym(relp)];
char const *symname = &str0[w(symp->st_name)]; char const *symname = &str0[w(symp->st_name)];
char const *mcount = '_' == gpfx ? "_mcount" : "mcount"; char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
if ('.' == symname[0]) if (symname[0] == '.')
++symname; /* ppc64 hack */ ++symname; /* ppc64 hack */
if (0 == strcmp(mcount, symname) || if (strcmp(mcount, symname) == 0 ||
(altmcount && 0 == strcmp(altmcount, symname))) (altmcount && strcmp(altmcount, symname) == 0))
mcountsym = Elf_r_sym(relp); mcountsym = Elf_r_sym(relp);
} }
@ -290,7 +290,7 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
mrelp->r_offset = _w(offbase mrelp->r_offset = _w(offbase
+ ((void *)mlocp - (void *)mloc0)); + ((void *)mlocp - (void *)mloc0));
Elf_r_info(mrelp, recsym, reltype); Elf_r_info(mrelp, recsym, reltype);
if (sizeof(Elf_Rela) == rel_entsize) { if (rel_entsize == sizeof(Elf_Rela)) {
((Elf_Rela *)mrelp)->r_addend = addend; ((Elf_Rela *)mrelp)->r_addend = addend;
*mlocp++ = 0; *mlocp++ = 0;
} else } else
@ -354,12 +354,12 @@ __has_rel_mcount(Elf_Shdr const *const relhdr, /* is SHT_REL or SHT_RELA */
Elf_Shdr const *const txthdr = &shdr0[w(relhdr->sh_info)]; Elf_Shdr const *const txthdr = &shdr0[w(relhdr->sh_info)];
char const *const txtname = &shstrtab[w(txthdr->sh_name)]; char const *const txtname = &shstrtab[w(txthdr->sh_name)];
if (0 == strcmp("__mcount_loc", txtname)) { if (strcmp("__mcount_loc", txtname) == 0) {
fprintf(stderr, "warning: __mcount_loc already exists: %s\n", fprintf(stderr, "warning: __mcount_loc already exists: %s\n",
fname); fname);
succeed_file(); succeed_file();
} }
if (SHT_PROGBITS != w(txthdr->sh_type) || if (w(txthdr->sh_type) != SHT_PROGBITS ||
!is_mcounted_section_name(txtname)) !is_mcounted_section_name(txtname))
return NULL; return NULL;
return txtname; return txtname;
@ -370,7 +370,7 @@ static char const *has_rel_mcount(Elf_Shdr const *const relhdr,
char const *const shstrtab, char const *const shstrtab,
char const *const fname) char const *const fname)
{ {
if (SHT_REL != w(relhdr->sh_type) && SHT_RELA != w(relhdr->sh_type)) if (w(relhdr->sh_type) != SHT_REL && w(relhdr->sh_type) != SHT_RELA)
return NULL; return NULL;
return __has_rel_mcount(relhdr, shdr0, shstrtab, fname); return __has_rel_mcount(relhdr, shdr0, shstrtab, fname);
} }