Apply editorial changes

Author: jserv

src/elf.c

@@ -299,9 +299,8 @@ bool elf_open(elf_t *e, const char *input)
 
 #if HAVE_MMAP
     int fd = open(path, O_RDONLY);
-    if (fd < 0) {
+    if (fd < 0)
         goto free_path;
-    }
 
     /* get file size */
     struct stat st;
@@ -312,24 +311,21 @@ bool elf_open(elf_t *e, const char *input)
      * The beginning of the file is ELF header.
      */
     e->raw_data = mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-    if (e->raw_data == MAP_FAILED) {
+    if (e->raw_data == MAP_FAILED)
         goto free_fd;
-    }
     close(fd);
 
 #else  /* fallback to standard I/O text stream */
     FILE *f = fopen(path, "rb");
-    if (!f) {
+    if (!f)
         goto free_path;
-    }
 
     /* get file size */
     fseek(f, 0, SEEK_END);
     e->raw_size = ftell(f);
     fseek(f, 0, SEEK_SET);
-    if (e->raw_size == 0) {
+    if (!e->raw_size)
         goto free_fd;
-    }
 
     /* allocate memory */
     free(e->raw_data);
@@ -339,18 +335,16 @@ bool elf_open(elf_t *e, const char *input)
     /* read data into memory */
     const size_t r = fread(e->raw_data, 1, e->raw_size, f);
     fclose(f);
-    if (r != e->raw_size) {
+    if (r != e->raw_size)
         goto free_path;
-    }
 #endif /* HAVE_MMAP */
 
     /* point to the header */
     e->hdr = (const struct Elf32_Ehdr *) e->raw_data;
 
     /* check it is a valid ELF file */
-    if (!is_valid(e)) {
+    if (!is_valid(e))
         goto free_path;
-    }
 
     free(path);
     return true;

src/elf.h

@@ -32,9 +32,7 @@ enum {
     EI_NIDENT = 16,
 };
 
-/*
- * Section Types
- */
+/* Section Types */
 enum {
     SHT_NULL = 0,     /* Section header table entry unused */
     SHT_PROGBITS = 1, /* Program data */
@@ -55,9 +53,7 @@ enum {
     SHT_HIUSER = 0xffffffff, /* End of application-specific */
 };
 
-/*
- * Section Attribute Flags
- */
+/* Section Attribute Flags */
 enum {
     SHF_WRITE = 0x1,
     SHF_ALLOC = 0x2,

src/gdbstub.c

@@ -53,7 +53,8 @@ static int rv_read_mem(void *args, size_t addr, size_t len, void *val)
     for (size_t i = 0; i < len; i++) {
         /* FIXME: This is implemented as a simple workaround for reading
          * an invalid address. We may have to do error handling in the
-         * mem_read_* function directly. */
+         * mem_read_* function directly.
+         */
         *((uint8_t *) val + i) = rv->io.mem_read_b(addr + i);
     }
 

src/jit.c

@@ -758,9 +758,8 @@ static void divmod(struct jit_state *state,
      * instruction already returns 0 when dividing by zero.
      */
     emit_dataproc_2source(state, is64, DP2_UDIV, div_dest, rn, rm);
-    if (mod) {
+    if (mod)
         emit_dataproc_3source(state, is64, DP3_MSUB, rd, rm, div_dest, rn);
-    }
 }
 #endif
 

src/main.c

@@ -150,7 +150,7 @@ static bool parse_args(int argc, char **args)
         assert(getcwd(cwd_path, PATH_MAX));
 
         char rel_path[PATH_MAX] = {0};
-        memcpy(rel_path, args[0], strlen(args[0]) - 7 /* strlen("rv32emu")*/);
+        memcpy(rel_path, args[0], strlen(args[0]) - 7 /* strlen("rv32emu") */);
 
         char *prog_basename = basename(opt_prog_name);
         prof_out_file = malloc(strlen(cwd_path) + 1 + strlen(rel_path) +

src/map.c

@@ -290,7 +290,8 @@ static void rb_remove(map_t rb, map_node_t *node)
                     rb_node_set_right(pathp[-1].node, left);
             }
             return;
-        } else if (pathp == path) {
+        }
+        if (pathp == path) {
             /* the tree only contained one node */
             rb->root = NULL;
             return;

src/mpool.c

@@ -30,13 +30,13 @@ typedef struct mpool {
 
 static void *mem_arena(size_t sz)
 {
+    void *p;
 #if HAVE_MMAP
-    void *p =
-        mmap(0, sz, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+    p = mmap(0, sz, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
     if (p == MAP_FAILED)
         return NULL;
 #else
-    void *p = malloc(sz);
+    p = malloc(sz);
     if (!p)
         return NULL;
 #endif
@@ -81,9 +81,11 @@ static void *mpool_extend(mpool_t *mp)
     char *p = mem_arena(pool_size);
     if (!p)
         return NULL;
+
     area_t *new_area = malloc(sizeof(area_t));
     if (!new_area)
         return NULL;
+
     new_area->mapped = p;
     new_area->next = NULL;
     size_t chunk_count = pool_size / (sizeof(memchunk_t) + mp->chunk_size);
@@ -95,19 +97,21 @@ static void *mpool_extend(mpool_t *mp)
         cur = cur->next;
     }
     mp->chunk_count += chunk_count;
+
     /* insert new mapped */
     area_t *cur_area = &mp->area;
-    while (cur_area->next) {
+    while (cur_area->next)
         cur_area = cur_area->next;
-    }
     cur_area->next = new_area;
+
     return p;
 }
 
 void *mpool_alloc(mpool_t *mp)
 {
     if (!mp->chunk_count && !(mpool_extend(mp)))
         return NULL;
+
     char *ptr = (char *) mp->free_chunk_head + sizeof(memchunk_t);
     mp->free_chunk_head = mp->free_chunk_head->next;
     mp->chunk_count--;
@@ -118,6 +122,7 @@ void *mpool_calloc(mpool_t *mp)
 {
     if (!mp->chunk_count && !(mpool_extend(mp)))
         return NULL;
+
     char *ptr = (char *) mp->free_chunk_head + sizeof(memchunk_t);
     mp->free_chunk_head = mp->free_chunk_head->next;
     mp->chunk_count--;

src/riscv.c

@@ -49,6 +49,7 @@ void block_map_clear(riscv_t *rv)
         block_t *block = map->map[i];
         if (!block)
             continue;
+
         uint32_t idx;
         rv_insn_t *ir, *next;
         for (idx = 0, ir = block->ir_head; idx < block->n_insn;
@@ -110,15 +111,13 @@ riscv_word_t rv_get_reg(riscv_t *rv, uint32_t reg)
     return ~0U;
 }
 
-/*
- * Remap standard stream
+/* Remap standard stream
  *
  * @rv: riscv
  * @fsp: a list of pair of mapping from fd to FILE *
  * @fsp_size: list size
  *
  * Note: fd inside fsp should be 0 or 1 or 2 only
- *
  */
 void rv_remap_stdstream(riscv_t *rv, fd_stream_pair_t *fsp, uint32_t fsp_size)
 {
@@ -195,9 +194,7 @@ riscv_t *rv_create(const riscv_io_t *io, riscv_user_t rv_attr)
         /* TODO: system emulator */
     }
 
-    /*
-     * default standard stream
-     *
+    /* default standard stream.
      * rv_remap_stdstream can be called to overwrite them
      */
     attr->fd_map = map_init(int, FILE *, map_cmp_int);
@@ -274,7 +271,8 @@ void rv_run(riscv_t *rv)
     else if (attr->run_flag & RV_RUN_GDBSTUB)
         rv_debug(rv);
 #endif
-    else {                                     /* default main loop */
+    else {
+        /* default main loop */
         for (; !rv_has_halted(rv);)            /* run until the flag is done */
             rv_step(rv, attr->cycle_per_step); /* step instructions */
     }

src/syscall.c

@@ -14,6 +14,7 @@
 #include "utils.h"
 
 #define PREALLOC_SIZE 4096
+
 /* newlib is a portable (not RISC-V specific) C library, which implements
  * printf(3) and other functions described in C standards. Some system calls
  * should be provided in conjunction with newlib.
@@ -106,6 +107,7 @@ static void syscall_write(riscv_t *rv)
         } else
             goto error_handler;
     }
+
     memory_read(attr->mem, tmp, buffer + total_write, count);
     if (!map_at_end(attr->fd_map, &it)) {
         /* write out the data */
@@ -117,9 +119,11 @@ static void syscall_write(riscv_t *rv)
     } else
         goto error_handler;
     assert(total_write == rv_get_reg(rv, rv_reg_a2));
+
     /* return number of bytes written */
     rv_set_reg(rv, rv_reg_a0, total_write);
     return;
+
     /* read the string being printed */
 error_handler:
     /* error */
@@ -129,9 +133,7 @@ static void syscall_write(riscv_t *rv)
 
 static void syscall_exit(riscv_t *rv)
 {
-    /*
-     * simply halt cpu and save exit code
-     *
+    /* simply halt cpu and save exit code.
      * the application decides the usage of exit code
      */
     rv_halt(rv);

src/syscall_sdl.c

@@ -630,11 +630,15 @@ static void *sfx_handler(void *arg)
     if (chan == -1)
         return NULL;
 
-    if (*ptr & 0x3) /* Doom, multiplied by 8 because sfx->volume's max is 15 */
+    if (*ptr & 0x3) {
+        /* Doom, multiplied by 8 because sfx->volume's max is 15 */
         Mix_Volume(chan, sfx->volume * 8);
-    else /* Quake, + 1 mod by 128 because sfx->volume's max is 255 and
-            Mix_Volume's max is 128 */
+    } else {
+        /* Quake, + 1 mod by 128 because sfx->volume's max is 255 and
+         * Mix_Volume's max is 128.
+         */
         Mix_Volume(chan, (sfx->volume + 1) % 128);
+    }
 
     return NULL;
 }