[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for 6.2 07/49] bsd-user: style nits: apply qemu style to these fi
From: |
Warner Losh |
Subject: |
[PATCH for 6.2 07/49] bsd-user: style nits: apply qemu style to these files |
Date: |
Sat, 7 Aug 2021 15:42:00 -0600 |
Fix style wrt {} placement, spaces around () and line lengths.
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/i386/target_arch_elf.h | 27 ++++++++++++++++-----------
bsd-user/x86_64/target_arch_elf.h | 11 +++++++----
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/bsd-user/i386/target_arch_elf.h b/bsd-user/i386/target_arch_elf.h
index 20ef0ccbdb..f322fc174b 100644
--- a/bsd-user/i386/target_arch_elf.h
+++ b/bsd-user/i386/target_arch_elf.h
@@ -25,10 +25,12 @@ static const char *get_elf_platform(void)
{
static char elf_platform[] = "i386";
int family = object_property_get_int(OBJECT(thread_cpu), "family", NULL);
- if (family > 6)
+ if (family > 6) {
family = 6;
- if (family >= 3)
+ }
+ if (family >= 3) {
elf_platform[1] = '0' + family;
+ }
return elf_platform;
}
@@ -46,7 +48,7 @@ static uint32_t get_elf_hwcap(void)
/*
* This is used to ensure we don't load something for the wrong architecture.
*/
-#define elf_check_arch(x) ( ((x) == EM_386) || ((x) == EM_486) )
+#define elf_check_arch(x) (((x) == EM_386) || ((x) == EM_486))
/*
* These are used to set parameters in the core dumps.
@@ -55,18 +57,21 @@ static uint32_t get_elf_hwcap(void)
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
-static inline void init_thread(struct target_pt_regs *regs, struct image_info
*infop)
+static inline void init_thread(struct target_pt_regs *regs,
+ struct image_info *infop)
{
regs->esp = infop->start_stack;
regs->eip = infop->entry;
- /* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program
- starts %edx contains a pointer to a function which might be
- registered using `atexit'. This provides a mean for the
- dynamic linker to call DT_FINI functions for shared libraries
- that have been loaded before the code runs.
-
- A value of 0 tells we have no such handler. */
+ /*
+ * SVR4/i386 ABI (pages 3-31, 3-32) says that when the program starts %edx
+ * contains a pointer to a function which might be registered using
+ * `atexit'. This provides a mean for the dynamic linker to call DT_FINI
+ * functions for shared libraries that have been loaded before the code
+ * runs.
+ *
+ * A value of 0 tells we have no such handler.
+ */
regs->edx = 0;
}
diff --git a/bsd-user/x86_64/target_arch_elf.h
b/bsd-user/x86_64/target_arch_elf.h
index d3c139c7a9..e7c8aa2755 100644
--- a/bsd-user/x86_64/target_arch_elf.h
+++ b/bsd-user/x86_64/target_arch_elf.h
@@ -25,10 +25,12 @@ static const char *get_elf_platform(void)
{
static char elf_platform[] = "i386";
int family = object_property_get_int(OBJECT(thread_cpu), "family", NULL);
- if (family > 6)
+ if (family > 6) {
family = 6;
- if (family >= 3)
+ }
+ if (family >= 3) {
elf_platform[1] = '0' + family;
+ }
return elf_platform;
}
@@ -42,13 +44,14 @@ static uint32_t get_elf_hwcap(void)
}
#define ELF_START_MMAP 0x2aaaaab000ULL
-#define elf_check_arch(x) ( ((x) == ELF_ARCH) )
+#define elf_check_arch(x) (((x) == ELF_ARCH))
#define ELF_CLASS ELFCLASS64
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_X86_64
-static inline void init_thread(struct target_pt_regs *regs, struct image_info
*infop)
+static inline void init_thread(struct target_pt_regs *regs,
+ struct image_info *infop)
{
regs->rax = 0;
regs->rsp = infop->start_stack;
--
2.32.0
- [PATCH for 6.2 02/49] bsd-user: add copyright header to elfload.c, (continued)
- [PATCH for 6.2 02/49] bsd-user: add copyright header to elfload.c, Warner Losh, 2021/08/07
- [PATCH for 6.2 01/49] bsd-user: remove sparc and sparc64, Warner Losh, 2021/08/07
- [PATCH for 6.2 03/49] bsd-user: Add Stacey's copyright to main.c, Warner Losh, 2021/08/07
- [PATCH for 6.2 04/49] bsd-user: Remove all non-x86 code from elfload.c, Warner Losh, 2021/08/07
- [PATCH for 6.2 05/49] bsd-user: move arch specific defines out of elfload.c, Warner Losh, 2021/08/07
- [PATCH for 6.2 07/49] bsd-user: style nits: apply qemu style to these files,
Warner Losh <=
- [PATCH for 6.2 06/49] bsd-user: merge comments and guards from bsd-user fork, Warner Losh, 2021/08/07
- [PATCH for 6.2 08/49] bsd-user: style nits: fix whitespace issues to be qemu standard, Warner Losh, 2021/08/07
- [PATCH for 6.2 09/49] bsd-user: add license, Warner Losh, 2021/08/07
- [PATCH for 6.2 10/49] bsd-user: pass the bsd_param into loader_exec, Warner Losh, 2021/08/07
- [PATCH for 6.2 11/49] bsd-user: Fix calculation of size to allocate, Warner Losh, 2021/08/07