Skip to content

Commit 0cca7bf

Browse files
xerpixerpi
committed
Pass .clang-format
1 parent 9d9d0ba commit 0cca7bf

7 files changed

Lines changed: 164 additions & 163 deletions

File tree

‎source/load.c‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static int elf_get_sce_module_info(Elf32_Addr e_entry, const segment_info_t *seg
109109
uint32_t offset;
110110
uint32_t index;
111111

112-
index = (e_entry & 0xC0000000) >> 30;
112+
index = (e_entry & 0xC0000000) >> 30;
113113
offset = e_entry & 0x3FFFFFFF;
114114

115115
if (segments[index].src_data == NULL) {
@@ -206,8 +206,8 @@ static int load_executable(Jit *jit, const uint8_t *data, void **entry)
206206
static int load_self(Jit *jit, const void *data, void **entry)
207207
{
208208
const SCE_header *self_header = data;
209-
const Elf32_Ehdr *elf_hdr = (void *)((char *)data + self_header->elf_offset);
210-
const Elf32_Phdr *prog_hdrs = (void *)((char *)data + self_header->phdr_offset);
209+
const Elf32_Ehdr *elf_hdr = (void *)((char *)data + self_header->elf_offset);
210+
const Elf32_Phdr *prog_hdrs = (void *)((char *)data + self_header->phdr_offset);
211211
const segment_info *seg_infos = (void *)((char *)data + self_header->section_info_offset);
212212
segment_info_t *segments;
213213
const Elf32_Phdr *seg_header;
@@ -248,21 +248,21 @@ static int load_self(Jit *jit, const void *data, void **entry)
248248

249249
for (Elf32_Half i = 0; i < elf_hdr->e_phnum; i++) {
250250
seg_header = &prog_hdrs[i];
251-
seg_bytes = (uint8_t *)data + self_header->header_len + seg_header->p_offset;
251+
seg_bytes = (uint8_t *)data + self_header->header_len + seg_header->p_offset;
252252

253253
LOG("Segment %i: encryption: %lld, compression: %lld", i, seg_infos[i].encryption,
254254
seg_infos[i].compression);
255255

256-
segments[i].p_type = seg_header->p_type;
256+
segments[i].p_type = seg_header->p_type;
257257
segments[i].p_filesz = seg_header->p_filesz;
258-
segments[i].p_memsz = seg_header->p_memsz;
259-
segments[i].p_flags = seg_header->p_flags;
260-
segments[i].p_align = seg_header->p_align;
258+
segments[i].p_memsz = seg_header->p_memsz;
259+
segments[i].p_flags = seg_header->p_flags;
260+
segments[i].p_align = seg_header->p_align;
261261

262262
if (seg_header->p_type == PT_LOAD) {
263263
if (seg_header->p_memsz != 0) {
264264
if (seg_infos[i].compression == 2) {
265-
dest_bytes = seg_header->p_filesz;
265+
dest_bytes = seg_header->p_filesz;
266266
uncompressed = malloc(seg_header->p_memsz);
267267
if (!uncompressed) {
268268
ret = -1;
@@ -276,15 +276,15 @@ static int load_self(Jit *jit, const void *data, void **entry)
276276
goto done;
277277
}
278278

279-
segments[i].src_data = uncompressed;
279+
segments[i].src_data = uncompressed;
280280
segments[i].needs_free = true;
281281
} else {
282282
segments[i].src_data = seg_bytes;
283283
}
284284
}
285285
} else if (seg_header->p_type == PT_LOOS) {
286286
if (seg_infos[i].compression == 2) {
287-
dest_bytes = seg_header->p_filesz;
287+
dest_bytes = seg_header->p_filesz;
288288
uncompressed = malloc(seg_header->p_filesz);
289289
if (!uncompressed) {
290290
ret = -1;
@@ -298,7 +298,7 @@ static int load_self(Jit *jit, const void *data, void **entry)
298298
goto done;
299299
}
300300

301-
segments[i].src_data = uncompressed;
301+
segments[i].src_data = uncompressed;
302302
segments[i].needs_free = true;
303303
} else {
304304
segments[i].src_data = seg_bytes;
@@ -347,11 +347,11 @@ static int load_elf(Jit *jit, const void *data, void **entry)
347347

348348
for (Elf32_Half i = 0; i < elf_hdr->e_phnum; i++) {
349349
segments[i].src_data = (char *)data + prog_hdrs[i].p_offset;
350-
segments[i].p_type = prog_hdrs[i].p_type;
350+
segments[i].p_type = prog_hdrs[i].p_type;
351351
segments[i].p_filesz = prog_hdrs[i].p_filesz;
352-
segments[i].p_memsz = prog_hdrs[i].p_memsz;
353-
segments[i].p_flags = prog_hdrs[i].p_flags;
354-
segments[i].p_align = prog_hdrs[i].p_align;
352+
segments[i].p_memsz = prog_hdrs[i].p_memsz;
353+
segments[i].p_flags = prog_hdrs[i].p_flags;
354+
segments[i].p_align = prog_hdrs[i].p_align;
355355
}
356356

357357
ret = load_segments(jit, entry, elf_hdr->e_entry, segments, elf_hdr->e_phnum);
@@ -421,12 +421,12 @@ static int load_segments(Jit *jit, void **entry, Elf32_Addr e_entry, segment_inf
421421
LOG(" p_align: 0x%" PRIx32, segments[i].p_align);
422422

423423
if ((segments[i].p_flags & PF_X) == PF_X) {
424-
length = ALIGN(code_rx_addr, segments[i].p_align) - code_rx_addr;
424+
length = ALIGN(code_rx_addr, segments[i].p_align) - code_rx_addr;
425425
addr_rx = code_rx_addr + code_offset;
426426
addr_rw = code_rw_addr + code_offset;
427427
code_offset += segments[i].p_memsz;
428428
} else {
429-
length = ALIGN(data_addr, segments[i].p_align) - data_addr;
429+
length = ALIGN(data_addr, segments[i].p_align) - data_addr;
430430
addr_rw = addr_rx = data_addr + data_offset;
431431
data_offset += segments[i].p_memsz;
432432
}
@@ -514,7 +514,7 @@ static int resolve_imports(uintptr_t rx_base, uintptr_t rw_base, sce_module_impo
514514
* it has already been relocated, so we have to convert them to RW addresses */
515515

516516
for (uint32_t i = 0; i < IMP_GET_FUNC_COUNT(import); i++) {
517-
nid = ((uint32_t *)CODE_RX_TO_RW_ADDR(rx_base, rw_base, IMP_GET_FUNC_TABLE(import)))[i];
517+
nid = ((uint32_t *)CODE_RX_TO_RW_ADDR(rx_base, rw_base, IMP_GET_FUNC_TABLE(import)))[i];
518518
stub = (void *)CODE_RX_TO_RW_ADDR(rx_base, rw_base, IMP_GET_FUNC_ENTRIES(import)[i]);
519519
addr = module_get_func_export(lib_nid, nid);
520520

@@ -573,9 +573,9 @@ static int relocate(const void *reloc, uint32_t size, segment_info_t *segs)
573573
// get values
574574
r_symseg = SCE_REL_SYMSEG(*entry);
575575
r_datseg = SCE_REL_DATSEG(*entry);
576-
symval = r_symseg == 15 ? 0 : (uint32_t)segs[r_symseg].rx_addr;
577-
loc_rw = (uint32_t)segs[r_datseg].rw_addr + r_offset;
578-
loc_rx = (uint32_t)segs[r_datseg].rx_addr + r_offset;
576+
symval = r_symseg == 15 ? 0 : (uint32_t)segs[r_symseg].rx_addr;
577+
loc_rw = (uint32_t)segs[r_datseg].rw_addr + r_offset;
578+
loc_rx = (uint32_t)segs[r_datseg].rx_addr + r_offset;
579579

580580
// perform relocation
581581
// taken from linux/arch/arm/kernel/module.c of Linux Kernel 4.0
@@ -612,19 +612,19 @@ static int relocate(const void *reloc, uint32_t size, segment_info_t *segs)
612612
* J1 = lower[13]
613613
* J2 = lower[11]
614614
*/
615-
sign = (upper >> 10) & 1;
616-
j1 = (lower >> 13) & 1;
617-
j2 = (lower >> 11) & 1;
615+
sign = (upper >> 10) & 1;
616+
j1 = (lower >> 13) & 1;
617+
j2 = (lower >> 11) & 1;
618618
offset = r_addend + symval - loc_rx;
619619

620620
if (offset <= (int32_t)0xff000000 || offset >= (int32_t)0x01000000) {
621621
LOG("reloc 0x%" PRIx32 " out of range: 0x%08" PRIx32, pos, symval);
622622
break;
623623
}
624624

625-
sign = (offset >> 24) & 1;
626-
j1 = sign ^ (~(offset >> 23) & 1);
627-
j2 = sign ^ (~(offset >> 22) & 1);
625+
sign = (offset >> 24) & 1;
626+
j1 = sign ^ (~(offset >> 23) & 1);
627+
j2 = sign ^ (~(offset >> 22) & 1);
628628
upper = (uint16_t)((upper & 0xf800) | (sign << 10) | ((offset >> 12) & 0x03ff));
629629
lower =
630630
(uint16_t)((lower & 0xd000) | (j1 << 13) | (j2 << 11) | ((offset >> 1) & 0x07ff));
@@ -646,7 +646,7 @@ static int relocate(const void *reloc, uint32_t size, segment_info_t *segs)
646646
} break;
647647
case R_ARM_PREL31: {
648648
offset = r_addend + symval - loc_rx;
649-
value = offset & 0x7fffffff;
649+
value = offset & 0x7fffffff;
650650
} break;
651651
case R_ARM_MOVW_ABS_NC:
652652
case R_ARM_MOVT_ABS: {

‎source/module.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const void *module_get_func_export(uint32_t lib_nid, uint32_t func_nid)
1111
for (size_t i = 0; i < num_libs; i++) {
1212
if (__start_exported_libraries[i].nid == lib_nid) {
1313
const library_t *const lib = &__start_exported_libraries[i];
14-
size_t num_funcs = NUM_FUNCS(lib);
14+
size_t num_funcs = NUM_FUNCS(lib);
1515

1616
for (size_t j = 0; j < num_funcs; j++) {
1717
if (lib->func_nidtable_start[j] == func_nid)

‎source/modules/SceCtrl.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ EXPORT(SceCtrl, 0xA9C3CED6, int, sceCtrlPeekBufferPositive, int port, SceCtrlDat
5454
vita_buttons |= SCE_CTRL_SQUARE;
5555

5656
pad_data->buttons = vita_buttons;
57+
5758
pad_data->lx = (255 * (analog_stick_l.x - JOYSTICK_MIN)) / (JOYSTICK_MAX - JOYSTICK_MIN);
5859
pad_data->ly =
5960
(255 * ((255 - analog_stick_l.y) - JOYSTICK_MIN)) / (JOYSTICK_MAX - JOYSTICK_MIN);

0 commit comments

Comments
 (0)
⚡