ShuriZma
/
redream
mirror of https://github.com/inolen/redream.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ran clang-format

This commit is contained in:
Anthony Pesch 2016-11-16 20:48:18 -08:00
parent 26e1d47900
commit bc8d719a04
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hw/dreamcast.c
View File

@ -100,7 +100,8 @@ void dc_keydown(struct dreamcast *dc, enum keycode code, int16_t value) {
} }
} }
struct execute_interface *dc_create_execute_interface(device_run_cb run, int running) { struct execute_interface *dc_create_execute_interface(device_run_cb run,
int running) {
struct execute_interface *execute = struct execute_interface *execute =
calloc(1, sizeof(struct execute_interface)); calloc(1, sizeof(struct execute_interface));
execute->run = run; execute->run = run;

3
src/hw/dreamcast.h
View File

@ -158,7 +158,8 @@ void dc_paint(struct dreamcast *dc);
void dc_paint_debug_menu(struct dreamcast *dc, struct nk_context *ctx); void dc_paint_debug_menu(struct dreamcast *dc, struct nk_context *ctx);
void dc_keydown(struct dreamcast *dc, enum keycode code, int16_t value); void dc_keydown(struct dreamcast *dc, enum keycode code, int16_t value);
struct execute_interface *dc_create_execute_interface(device_run_cb run, int running); struct execute_interface *dc_create_execute_interface(device_run_cb run,
int running);
void dc_destroy_execute_interface(struct execute_interface *execute); void dc_destroy_execute_interface(struct execute_interface *execute);
struct memory_interface *dc_create_memory_interface(struct dreamcast *dc, struct memory_interface *dc_create_memory_interface(struct dreamcast *dc,

2
src/hw/sh4/sh4.c
View File

@ -135,7 +135,7 @@ void sh4_reset(struct sh4 *sh4, uint32_t pc) {
sh4->ctx.sr = 0x700000f0; sh4->ctx.sr = 0x700000f0;
sh4->ctx.fpscr = 0x00040001; sh4->ctx.fpscr = 0x00040001;
/* initialize registers */ /* initialize registers */
#define SH4_REG(addr, name, default, type) \ #define SH4_REG(addr, name, default, type) \
sh4->reg[name] = default; \ sh4->reg[name] = default; \
sh4->name = (type *)&sh4->reg[name]; sh4->name = (type *)&sh4->reg[name];

17
src/jit/frontend/armv3/armv3_fallback.c
View File

@ -159,7 +159,10 @@ static void armv3_fallback_shift(const struct armv3_context *ctx,
} }
} }
static inline void armv3_fallback_parse_shift(struct armv3_context *ctx, uint32_t addr, uint32_t reg, uint32_t shift, uint32_t *value, uint32_t *carry) { static inline void armv3_fallback_parse_shift(struct armv3_context *ctx,
uint32_t addr, uint32_t reg,
uint32_t shift, uint32_t *value,
uint32_t *carry) {
enum armv3_shift_source src; enum armv3_shift_source src;
enum armv3_shift_type type; enum armv3_shift_type type;
uint32_t n; uint32_t n;
@ -184,8 +187,7 @@ static inline void armv3_fallback_parse_shift(struct armv3_context *ctx, uint32_
} }
static inline uint32_t armv3_fallback_load_rn(struct armv3_context *ctx, static inline uint32_t armv3_fallback_load_rn(struct armv3_context *ctx,
uint32_t addr, uint32_t addr, int rn) {
int rn) {
if (rn == 15) { if (rn == 15) {
/* account for instruction prefetching if loading the pc */ /* account for instruction prefetching if loading the pc */
return addr + 8; return addr + 8;
@ -195,8 +197,7 @@ static inline uint32_t armv3_fallback_load_rn(struct armv3_context *ctx,
} }
static inline uint32_t armv3_fallback_load_rd(struct armv3_context *ctx, static inline uint32_t armv3_fallback_load_rd(struct armv3_context *ctx,
uint32_t addr, uint32_t addr, int rd) {
int rd) {
if (rd == 15) { if (rd == 15) {
/* account for instruction prefetching if loading the pc */ /* account for instruction prefetching if loading the pc */
return addr + 12; return addr + 12;
@ -274,7 +275,8 @@ static inline void armv3_fallback_parse_op2(struct armv3_context *ctx,
} }
} else { } else {
/* op2 is as shifted register */ /* op2 is as shifted register */
armv3_fallback_parse_shift(ctx, addr, i.data_reg.rm, i.data_reg.shift, value, carry); armv3_fallback_parse_shift(ctx, addr, i.data_reg.rm, i.data_reg.shift,
value, carry);
} }
} }
@ -616,7 +618,8 @@ static inline void armv3_fallback_memop(struct armv3_guest *guest,
uint32_t offset = 0; uint32_t offset = 0;
if (i.xfr.i) { if (i.xfr.i) {
uint32_t carry; uint32_t carry;
armv3_fallback_parse_shift(guest->ctx, addr, i.xfr_reg.rm, i.xfr_reg.shift, &offset, &carry); armv3_fallback_parse_shift(guest->ctx, addr, i.xfr_reg.rm, i.xfr_reg.shift,
&offset, &carry);
} else { } else {
offset = i.xfr_imm.imm; offset = i.xfr_imm.imm;
} }