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

ran latest clang-format

This commit is contained in:
Anthony Pesch 2016-06-21 23:40:25 -04:00
parent b54fabfe0e
commit ac2046bc36
60 changed files with 129 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.clang-format
View File

@ -3,3 +3,13 @@ AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: false
DerivePointerAlignment: false
PointerAlignment: Right
IncludeCategories:
- Regex: '^<.*\.h>'
Priority: -2
- Regex: '^<.*'
Priority: -1
- Regex: '.*'
Priority: 3

8
src/core/assert.h
View File

@ -20,8 +20,12 @@ const char *format_check_error(const char *filename, int linenum,
// 4+: VA_ARGS = format_check_error_ex
#define GET_FORMAT_CHECK_ERROR(_1, _2, _3, _4, _5, _6, _7, _8, _9, NAME, ...) \
NAME
#define FORMAT_CHECK_ERROR(...) \
GET_FORMAT_CHECK_ERROR(__VA_ARGS__, format_check_error_ex, format_check_error_ex, format_check_error_ex, format_check_error_ex, format_check_error_ex, format_check_error_ex, format_check_error)(__VA_ARGS__)
#define FORMAT_CHECK_ERROR(...) \
GET_FORMAT_CHECK_ERROR(__VA_ARGS__, format_check_error_ex, \
format_check_error_ex, format_check_error_ex, \
format_check_error_ex, format_check_error_ex, \
format_check_error_ex, format_check_error) \
(__VA_ARGS__)
// checks ran for all build configurations
#define CHECK_BINARY_OP(v1, v2, op, ...) \

8
src/core/core.h
View File

@ -13,10 +13,10 @@
(b) = tmp; \
} while (0)
#define container_of(ptr, type, member) \
({ \
const TYPEOF(((type*)0)->member)* __mptr = (ptr); \
(type*)((char*)__mptr - offsetof(type, member)); \
#define container_of(ptr, type, member) \
({ \
const TYPEOF(((type *)0)->member) *__mptr = (ptr); \
(type *)((char *)__mptr - offsetof(type, member)); \
})
#define array_size(arr) (int)(sizeof(arr) / sizeof((arr)[0]))

2
src/core/list.c
View File

@ -1,5 +1,5 @@
#include "core/assert.h"
#include "core/list.h"
#include "core/assert.h"
int list_empty(struct list *list) {
return !list->head;

2
src/core/mm_heap.c
View File

@ -1,6 +1,6 @@
#include "core/mm_heap.h"
#include "core/assert.h"
#include "core/core.h"
#include "core/mm_heap.h"
static inline bool mm_is_max_level(int index) {
int n = index + 1;

2
src/core/option.c
View File

@ -1,8 +1,8 @@
#include <ini.h>
#include <stdlib.h>
#include "core/option.h"
#include "core/log.h"
#include "core/math.h"
#include "core/option.h"
#include "core/string.h"
static struct list s_options;

2
src/core/rb_tree.c
View File

@ -1,5 +1,5 @@
#include "core/assert.h"
#include "core/rb_tree.h"
#include "core/assert.h"
static enum rb_color rb_color(struct rb_node *n) {
return n ? n->color : RB_BLACK;

25
src/emu/emulator.c
View File

@ -1,13 +1,13 @@
#include "core/option.h"
#include "emu/emulator.h"
#include "hw/gdrom/gdrom.h"
#include "hw/sh4/sh4.h"
#include "core/option.h"
#include "hw/dreamcast.h"
#include "hw/scheduler.h"
#include "hw/gdrom/gdrom.h"
#include "hw/memory.h"
#include "hw/scheduler.h"
#include "hw/sh4/sh4.h"
#include "sys/time.h"
#include "ui/nuklear.h"
#include "ui/window.h"
#include "sys/time.h"
DEFINE_OPTION_STRING(bios, "dc_boot.bin", "Path to BIOS");
DEFINE_OPTION_STRING(flash, "dc_flash.bin", "Path to flash ROM");
@ -133,7 +133,8 @@ static void emu_onpaint(void *data, bool show_main_menu) {
struct nk_panel layout;
if (nk_begin(ctx, &layout, "Demo", nk_rect(200, 200, 210, 250),
NK_WINDOW_BORDER | NK_WINDOW_MOVABLE | NK_WINDOW_SCALABLE | NK_WINDOW_MINIMIZABLE | NK_WINDOW_TITLE)) {
NK_WINDOW_BORDER | NK_WINDOW_MOVABLE | NK_WINDOW_SCALABLE |
NK_WINDOW_MINIMIZABLE | NK_WINDOW_TITLE)) {
enum { EASY, HARD };
static int op = EASY;
static int property = 20;
@ -161,10 +162,14 @@ static void emu_onpaint(void *data, bool show_main_menu) {
nk_layout_row_dynamic(ctx, 120, 1);
background = nk_color_picker(ctx, background, NK_RGBA);
nk_layout_row_dynamic(ctx, 25, 1);
background.r = (nk_byte)nk_propertyi(ctx, "#R:", 0, background.r, 255, 1, 1);
background.g = (nk_byte)nk_propertyi(ctx, "#G:", 0, background.g, 255, 1, 1);
background.b = (nk_byte)nk_propertyi(ctx, "#B:", 0, background.b, 255, 1, 1);
background.a = (nk_byte)nk_propertyi(ctx, "#A:", 0, background.a, 255, 1, 1);
background.r =
(nk_byte)nk_propertyi(ctx, "#R:", 0, background.r, 255, 1, 1);
background.g =
(nk_byte)nk_propertyi(ctx, "#G:", 0, background.g, 255, 1, 1);
background.b =
(nk_byte)nk_propertyi(ctx, "#B:", 0, background.b, 255, 1, 1);
background.a =
(nk_byte)nk_propertyi(ctx, "#A:", 0, background.a, 255, 1, 1);
nk_combo_end(ctx);
}
}

2
src/emu/tracer.cc
View File

@ -1,6 +1,6 @@
#include <imgui.h>
#include "core/math.h"
#include "emu/tracer.h"
#include "core/math.h"
#include "hw/holly/ta.h"
#include "hw/holly/tr.h"
#include "hw/holly/trace.h"

4
src/hw/aica/aica.c
View File

@ -1,10 +1,10 @@
#include "core/log.h"
#include "hw/aica/aica.h"
#include "core/log.h"
#include "hw/aica/aica_types.h"
#include "hw/arm/arm.h"
#include "hw/sh4/sh4.h"
#include "hw/dreamcast.h"
#include "hw/memory.h"
#include "hw/sh4/sh4.h"
struct aica {
struct device base;

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

@ -1,5 +1,5 @@
#include "hw/aica/aica.h"
#include "hw/arm/arm.h"
#include "hw/aica/aica.h"
#include "hw/dreamcast.h"
struct arm {

8
src/hw/dreamcast.c
View File

@ -1,17 +1,17 @@
#include "hw/dreamcast.h"
#include "core/option.h"
#include "core/string.h"
#include "hw/sh4/sh4.h"
#include "hw/arm/arm.h"
#include "hw/aica/aica.h"
#include "hw/arm/arm.h"
#include "hw/debugger.h"
#include "hw/gdrom/gdrom.h"
#include "hw/holly/holly.h"
#include "hw/holly/pvr.h"
#include "hw/holly/ta.h"
#include "hw/maple/maple.h"
#include "hw/dreamcast.h"
#include "hw/debugger.h"
#include "hw/memory.h"
#include "hw/scheduler.h"
#include "hw/sh4/sh4.h"
DEFINE_OPTION_BOOL(gdb, false, "Run gdb debug server");

2
src/hw/gdrom/disc.c
View File

@ -1,5 +1,5 @@
#include "core/assert.h"
#include "hw/gdrom/disc.h"
#include "core/assert.h"
static const int GDI_PREGAP_SIZE = 150;

4
src/hw/gdrom/gdrom.c
View File

@ -1,10 +1,10 @@
#include "hw/gdrom/gdrom.h"
#include "core/math.h"
#include "core/string.h"
#include "hw/gdrom/gdrom.h"
#include "hw/dreamcast.h"
#include "hw/gdrom/gdrom_replies.inc"
#include "hw/gdrom/gdrom_types.h"
#include "hw/holly/holly.h"
#include "hw/dreamcast.h"
#define SWAP_24(fad) \
(((fad & 0xff) << 16) | (fad & 0x00ff00) | ((fad & 0xff0000) >> 16))

4
src/hw/holly/holly.c
View File

@ -1,8 +1,8 @@
#include "hw/gdrom/gdrom.h"
#include "hw/holly/holly.h"
#include "hw/dreamcast.h"
#include "hw/gdrom/gdrom.h"
#include "hw/maple/maple.h"
#include "hw/sh4/sh4.h"
#include "hw/dreamcast.h"
static void holly_update_sh4_interrupts(struct holly *hl) {
// trigger the respective level-encoded interrupt on the sh4 interrupt

2
src/hw/holly/holly.h
View File

@ -2,8 +2,8 @@
#define HOLLY_H
#include <stdint.h>
#include "hw/holly/holly_types.h"
#include "hw/dreamcast.h"
#include "hw/holly/holly_types.h"
#include "hw/memory.h"
struct dreamcast;

4
src/hw/holly/pvr.c
View File

@ -1,8 +1,8 @@
#include "hw/holly/holly.h"
#include "hw/holly/pvr.h"
#include "hw/dreamcast.h"
#include "hw/holly/holly.h"
#include "hw/holly/ta.h"
#include "hw/sh4/sh4.h"
#include "hw/dreamcast.h"
static void pvr_next_scanline(void *data) {
struct pvr *pvr = data;

2
src/hw/holly/pvr.h
View File

@ -2,8 +2,8 @@
#define PVR_H
#include <stdint.h>
#include "hw/holly/pvr_types.h"
#include "hw/dreamcast.h"
#include "hw/holly/pvr_types.h"
#include "hw/memory.h"
#include "hw/scheduler.h"

4
src/hw/holly/ta.c
View File

@ -1,11 +1,11 @@
#include "hw/holly/ta.h"
#include "core/list.h"
#include "core/profiler.h"
#include "core/string.h"
#include "core/rb_tree.h"
#include "core/string.h"
#include "hw/holly/holly.h"
#include "hw/holly/pixel_convert.h"
#include "hw/holly/pvr.h"
#include "hw/holly/ta.h"
#include "hw/holly/tr.h"
#include "hw/holly/trace.h"
#include "hw/sh4/sh4.h"

2
src/hw/holly/tr.c
View File

@ -1,11 +1,11 @@
#include <float.h>
#include <string.h>
#include "hw/holly/tr.h"
#include "core/assert.h"
#include "core/core.h"
#include "core/profiler.h"
#include "hw/holly/pixel_convert.h"
#include "hw/holly/ta.h"
#include "hw/holly/tr.h"
struct tr {
struct rb *rb;

2
src/hw/holly/trace.c
View File

@ -1,7 +1,7 @@
#include <limits.h>
#include "hw/holly/tr.h"
#include "core/assert.h"
#include "hw/holly/ta.h"
#include "hw/holly/tr.h"
#include "hw/holly/trace.h"
#include "sys/filesystem.h"

2
src/hw/holly/trace.h
View File

@ -16,7 +16,7 @@ struct trace_cmd {
// set on read
struct trace_cmd *prev;
struct trace_cmd *next;
struct trace_cmd *override;
struct trace_cmd * override;
// the data pointers in these structs are written out relative to the cmd,
// and patched to absolute pointers on read

4
src/hw/maple/maple.c
View File

@ -1,7 +1,7 @@
#include "hw/holly/holly.h"
#include "hw/maple/maple.h"
#include "hw/sh4/sh4.h"
#include "hw/dreamcast.h"
#include "hw/holly/holly.h"
#include "hw/sh4/sh4.h"
struct maple {
struct device base;

2
src/hw/maple/maple.h
View File

@ -1,8 +1,8 @@
#ifndef MAPLE_H
#define MAPLE_H
#include "hw/maple/maple_types.h"
#include "hw/dreamcast.h"
#include "hw/maple/maple_types.h"
#include "ui/keycode.h"
struct dreamcast;

2
src/hw/memory.c
View File

@ -1,7 +1,7 @@
#include "hw/memory.h"
#include "core/math.h"
#include "core/string.h"
#include "hw/dreamcast.h"
#include "hw/memory.h"
#include "sys/exception_handler.h"
struct memory {

10
src/hw/memory.h
View File

@ -58,11 +58,11 @@ void memory_destroy(struct memory *memory);
uint32_t begin = 0; \
uint32_t size = 0; \
uint32_t mask = 0xffffffff; \
(void) self; \
(void) machine; \
(void) begin; \
(void) size; \
(void) mask;
(void)self; \
(void)machine; \
(void)begin; \
(void)size; \
(void)mask;
#define AM_RANGE(begin_, end_) \
begin = begin_; \
size = end_ - begin_ + 1; \

2
src/hw/scheduler.c
View File

@ -1,9 +1,9 @@
#include <stdio.h>
#include "hw/scheduler.h"
#include "core/assert.h"
#include "core/core.h"
#include "core/list.h"
#include "hw/dreamcast.h"
#include "hw/scheduler.h"
#define MAX_TIMERS 128

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

@ -1,18 +1,18 @@
#include "hw/sh4/sh4.h"
#include "core/math.h"
#include "core/profiler.h"
#include "core/string.h"
#include "jit/backend/backend.h"
#include "jit/frontend/sh4/sh4_analyze.h"
#include "hw/aica/aica.h"
#include "hw/debugger.h"
#include "hw/dreamcast.h"
#include "hw/holly/holly.h"
#include "hw/holly/pvr.h"
#include "hw/holly/ta.h"
#include "hw/sh4/sh4.h"
#include "hw/sh4/sh4_code_cache.h"
#include "hw/dreamcast.h"
#include "hw/debugger.h"
#include "hw/memory.h"
#include "hw/scheduler.h"
#include "hw/sh4/sh4_code_cache.h"
#include "jit/backend/backend.h"
#include "jit/frontend/sh4/sh4_analyze.h"
#include "sys/time.h"
#define SH4_CLOCK_FREQ INT64_C(200000000)
@ -23,8 +23,7 @@ struct sh4_interrupt_info {
static struct sh4_interrupt_info sh4_interrupts[NUM_SH_INTERRUPTS] = {
#define SH4_INT(name, intevt, pri, ipr, ipr_shift) \
{ intevt, pri, ipr, ipr_shift } \
,
{intevt, pri, ipr, ipr_shift},
#include "hw/sh4/sh4_int.inc"
#undef SH4_INT
};

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

@ -1,9 +1,9 @@
#ifndef SH4_H
#define SH4_H
#include "hw/sh4/sh4_types.h"
#include "hw/dreamcast.h"
#include "hw/memory.h"
#include "hw/sh4/sh4_types.h"
#include "jit/frontend/sh4/sh4_context.h"
struct dreamcast;

6
src/hw/sh4/sh4_code_cache.c
View File

@ -1,11 +1,11 @@
#include "hw/sh4/sh4_code_cache.h"
#include "core/core.h"
#include "core/profiler.h"
#include "hw/sh4/sh4_code_cache.h"
#include "jit/backend/backend.h"
#include "jit/backend/x64/x64_backend.h"
#include "jit/frontend/frontend.h"
#include "jit/frontend/sh4/sh4_analyze.h"
#include "jit/frontend/sh4/sh4_frontend.h"
#include "jit/backend/backend.h"
#include "jit/frontend/frontend.h"
#include "jit/ir/ir.h"
// #include "jit/ir/passes/constant_propagation_pass.h"
// #include "jit/ir/passes/conversion_elimination_pass.h"

4
src/jit/backend/x64/x64_backend.cc
View File

@ -1,12 +1,12 @@
#include <inttypes.h>
#include <capstone.h>
#include <inttypes.h>
#include <xbyak/xbyak.h>
extern "C" {
#include "core/profiler.h"
#include "jit/backend/backend.h"
#include "jit/backend/x64/x64_backend.h"
#include "jit/backend/x64/x64_disassembler.h"
#include "jit/backend/backend.h"
#include "jit/ir/ir.h"
#include "sys/exception_handler.h"
#include "sys/memory.h"

2
src/jit/frontend/frontend.h
View File

@ -1,6 +1,8 @@
#ifndef FRONTEND_H
#define FRONTEND_H
#include <stdint.h>
struct ir;
struct jit_frontend;

7
src/jit/frontend/sh4/sh4_disasm.c
View File

@ -1,6 +1,6 @@
#include "jit/frontend/sh4/sh4_disasm.h"
#include "core/assert.h"
#include "core/string.h"
#include "jit/frontend/sh4/sh4_disasm.h"
struct sh4_opdef {
enum sh4_op op;
@ -17,9 +17,8 @@ struct sh4_opdef {
static struct sh4_opdef s_opdefs[NUM_SH4_OPS] = {
{SH4_OP_INVALID, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
#define SH4_INSTR(name, desc, sig, cycles, flags) \
{ SH4_OP_##name, desc, #sig, cycles, flags, 0, 0, 0, 0, 0, 0, 0, 0, 0 } \
,
#define SH4_INSTR(name, desc, sig, cycles, flags) \
{SH4_OP_##name, desc, #sig, cycles, flags, 0, 0, 0, 0, 0, 0, 0, 0, 0},
#include "jit/frontend/sh4/sh4_instr.inc"
#undef SH4_INSTR
};

4
src/jit/frontend/sh4/sh4_frontend.c
View File

@ -1,8 +1,8 @@
#include "jit/frontend/sh4/sh4_frontend.h"
#include "jit/frontend/frontend.h"
#include "jit/frontend/sh4/sh4_analyze.h"
#include "jit/frontend/sh4/sh4_disasm.h"
#include "jit/frontend/sh4/sh4_frontend.h"
#include "jit/frontend/sh4/sh4_translate.h"
#include "jit/frontend/frontend.h"
#include "jit/ir/ir.h"
struct sh4_frontend {

2
src/jit/frontend/sh4/sh4_translate.c
View File

@ -1,10 +1,10 @@
#include "jit/frontend/sh4/sh4_translate.h"
#include "core/assert.h"
#include "core/profiler.h"
#include "jit/frontend/sh4/sh4_analyze.h"
#include "jit/frontend/sh4/sh4_context.h"
#include "jit/frontend/sh4/sh4_disasm.h"
#include "jit/frontend/sh4/sh4_frontend.h"
#include "jit/frontend/sh4/sh4_translate.h"
#include "jit/ir/ir.h"
//

2
src/jit/frontend/sh4/sh4_translate.h
View File

@ -1,6 +1,8 @@
#ifndef SH4_BUILDER_H
#define SH4_BUILDER_H
#include <stdint.h>
struct ir;
void sh4_translate(uint32_t guest_addr, uint8_t *guest_ptr, int size, int flags,

2
src/jit/ir/ir.c
View File

@ -1,5 +1,5 @@
#include "core/math.h"
#include "jit/ir/ir.h"
#include "core/math.h"
const char *ir_op_names[NUM_OPS] = {
#define IR_OP(name) #name,

2
src/jit/ir/ir_read.c
View File

@ -1,5 +1,5 @@
#include "core/string.h"
#include "jit/ir/ir.h"
#include "core/string.h"
enum ir_token {
TOK_EOF,

2
src/jit/ir/ir_write.c
View File

@ -1,6 +1,6 @@
#include <inttypes.h>
#include "core/string.h"
#include "jit/ir/ir.h"
#include "core/string.h"
static void ir_write_type(enum ir_type type, FILE *output) {
switch (type) {

2
src/jit/ir/passes/conversion_elimination_pass.c
View File

@ -1,6 +1,6 @@
#include "jit/ir/passes/conversion_elimination_pass.h"
#include "jit/ir/passes/pass_stat.h"
#include "jit/ir/ir.h"
#include "jit/ir/passes/pass_stat.h"
DEFINE_STAT(num_sext_removed, "Number of sext eliminated");
DEFINE_STAT(num_zext_removed, "Number of zext eliminated");

2
src/jit/ir/passes/dead_code_elimination_pass.c
View File

@ -1,6 +1,6 @@
#include "jit/ir/passes/dead_code_elimination_pass.h"
#include "jit/ir/passes/pass_stat.h"
#include "jit/ir/ir.h"
#include "jit/ir/passes/pass_stat.h"
DEFINE_STAT(num_dead_removed, "Number of dead instructions eliminated");

2
src/jit/ir/passes/load_store_elimination_pass.c
View File

@ -1,6 +1,6 @@
#include "jit/ir/passes/load_store_elimination_pass.h"
#include "jit/ir/passes/pass_stat.h"
#include "jit/ir/ir.h"
#include "jit/ir/passes/pass_stat.h"
DEFINE_STAT(num_loads_removed, "Number of loads eliminated");
DEFINE_STAT(num_stores_removed, "Number of stores eliminated");

2
src/jit/ir/passes/pass_stat.c
View File

@ -1,7 +1,7 @@
#include "jit/ir/passes/pass_stat.h"
#include "core/assert.h"
#include "core/math.h"
#include "core/string.h"
#include "jit/ir/passes/pass_stat.h"
static struct list s_stats;

4
src/jit/ir/passes/register_allocation_pass.c
View File

@ -1,8 +1,8 @@
#include "jit/ir/passes/register_allocation_pass.h"
#include "core/mm_heap.h"
#include "jit/backend/backend.h"
#include "jit/ir/passes/pass_stat.h"
#include "jit/ir/passes/register_allocation_pass.h"
#include "jit/ir/ir.h"
#include "jit/ir/passes/pass_stat.h"
DEFINE_STAT(num_spills, "Number of registers spilled");

2
src/sys/exception_handler.c
View File

@ -1,6 +1,6 @@
#include "sys/exception_handler.h"
#include "core/assert.h"
#include "core/list.h"
#include "sys/exception_handler.h"
#define MAX_EXCEPTION_HANDLERS 32

2
src/sys/exception_handler_mac.c
View File

@ -1,7 +1,7 @@
#include <mach/mach.h>
#include <pthread.h>
#include "core/log.h"
#include "sys/exception_handler.h"
#include "core/log.h"
// POSIX signal handlers, for whatever reason, don't seem to be invoked for
// segmentation faults on OSX when running the application under lldb / gdb.

2
src/sys/filesystem.c
View File

@ -1,10 +1,10 @@
#include <errno.h>
#include <stdlib.h>
#include "sys/filesystem.h"
#include "core/debug_break.h"
#include "core/log.h"
#include "core/math.h"
#include "core/string.h"
#include "sys/filesystem.h"
const char *fs_appdir() {
static char appdir[PATH_MAX] = {};

3
src/sys/filesystem.h
View File

@ -17,10 +17,9 @@
#else
#include <windows.h>
#include <direct.h>
#include <windows.h>
#include <dirent/dirent.h>
#include <windows.h>
#define PATH_SEPARATOR "\\"
#define PATH_MAX MAX_PATH

4
src/sys/memory.c
View File

@ -1,10 +1,10 @@
#include <stdlib.h>
#include "sys/memory.h"
#include "core/assert.h"
#include "core/list.h"
#include "core/interval_tree.h"
#include "core/list.h"
#include "core/math.h"
#include "sys/exception_handler.h"
#include "sys/memory.h"
#define MAX_WATCHES 1024

4
src/sys/memory_posix.c
View File

@ -1,12 +1,12 @@
#include <fcntl.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
#include "sys/memory.h"
#include "core/assert.h"
#include "core/list.h"
#include "core/string.h"
#include "sys/filesystem.h"
#include "sys/memory.h"
#define MAX_SHMEM 128

2
src/sys/time_mac.c
View File

@ -1,7 +1,7 @@
#include <mach/mach.h>
#include <mach/mach_time.h>
#include "core/assert.h"
#include "sys/time.h"
#include "core/assert.h"
static const int64_t NS_PER_SEC = INT64_C(1000000000);

2
src/ui/keycode.c
View File

@ -1,5 +1,5 @@
#include "core/string.h"
#include "ui/keycode.h"
#include "core/string.h"
struct key {
enum keycode code;

9
src/ui/nuklear.c
View File

@ -1,8 +1,8 @@
#include <stdlib.h>
#include "ui/nuklear.h"
#include "core/core.h"
#include "core/string.h"
#include "renderer/backend.h"
#include "ui/nuklear.h"
#include "ui/window.h"
#define NK_IMPLEMENTATION
@ -120,7 +120,8 @@ static void nuklear_onpostpaint(void *data) {
surf.dst_blend = BLEND_ONE_MINUS_SRC_ALPHA;
surf.scissor = true;
surf.scissor_rect[0] = cmd->clip_rect.x;
surf.scissor_rect[1] = nk->window->height - (cmd->clip_rect.y + cmd->clip_rect.h);
surf.scissor_rect[1] =
nk->window->height - (cmd->clip_rect.y + cmd->clip_rect.h);
surf.scissor_rect[2] = cmd->clip_rect.w;
surf.scissor_rect[3] = cmd->clip_rect.h;
surf.first_vert = n;
@ -177,13 +178,13 @@ static void nuklear_onkeydown(void *data, enum keycode code, int16_t value) {
static void nuklear_ontextinput(void *data, const char *text) {
struct nuklear *nk = data;
//io.AddInputCharactersUTF8(text);
// io.AddInputCharactersUTF8(text);
}
static void nuklear_onmousemove(void *data, int x, int y) {
struct nuklear *nk = data;
//io.MousePos = ImVec2((float)x, (float)y);
// io.MousePos = ImVec2((float)x, (float)y);
}
struct nk_context *nuklear_context(struct nuklear *nk) {

2
src/ui/nuklear.h
View File

@ -1,6 +1,8 @@
#ifndef NUKLEAR_H
#define NUKLEAR_H
#include <stdbool.h>
#define NK_INCLUDE_FIXED_TYPES
#define NK_INCLUDE_STANDARD_IO
#define NK_INCLUDE_DEFAULT_ALLOCATOR

6
src/ui/window.c
View File

@ -1,11 +1,11 @@
#include <stdlib.h>
#include <SDL.h>
#include <stdlib.h>
#include "ui/window.h"
#include "core/assert.h"
#include "core/list.h"
#include "renderer/backend.h"
#include "ui/nuklear.h"
#include "ui/microprofile.h"
#include "ui/window.h"
#include "ui/nuklear.h"
#define DEFAULT_WIDTH 640
#define DEFAULT_HEIGHT 480

2
test/test_dead_code_elimination_pass.cc
View File

@ -1,8 +1,8 @@
#include <gtest/gtest.h>
extern "C" {
#include "jit/ir/passes/dead_code_elimination_pass.h"
#include "jit/ir/ir.h"
#include "jit/ir/passes/dead_code_elimination_pass.h"
}
static uint8_t ir_buffer[1024 * 1024];

2
test/test_interval_tree.cc
View File

@ -1,6 +1,6 @@
#include <gtest/gtest.h>
#include <math.h>
#include <set>
#include <gtest/gtest.h>
extern "C" {
#define VERIFY_INTRUSIVE_TREE

2
test/test_load_store_elimination_pass.cc
View File

@ -1,8 +1,8 @@
#include <gtest/gtest.h>
extern "C" {
#include "jit/ir/passes/load_store_elimination_pass.h"
#include "jit/ir/ir.h"
#include "jit/ir/passes/load_store_elimination_pass.h"
}
static uint8_t ir_buffer[1024 * 1024];

4
test/test_sh4.cc
View File

@ -1,14 +1,14 @@
#include <gtest/gtest.h>
#include <limits.h>
#include <memory>
#include <unordered_map>
#include <gtest/gtest.h>
extern "C" {
#include "core/math.h"
#include "hw/sh4/sh4.h"
#include "hw/dreamcast.h"
#include "hw/memory.h"
#include "hw/scheduler.h"
#include "hw/sh4/sh4.h"
#include "sys/exception_handler.h"
}

2
tools/recc.cc
View File

@ -1,8 +1,8 @@
#include <gflags/gflags.h>
#include <fstream>
#include <iostream>
#include <memory>
#include <sstream>
#include <gflags/gflags.h>
#include "jit/backend/x64/x64_backend.h"
#include "jit/frontend/sh4/sh4_frontend.h"
#include "jit/ir/ir_builder.h"