github/sparrow-kata-full
1
0
Fork 0
mirror of https://github.com/AmbiML/sparrow-kata-full.git synced 2025-09-04 15:04:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge "kata: clang-format C test apps"

Browse Source 
GitOrigin-RevId: 88ffd6d1d37febf95c606cf51804069ac5efeb50
This commit is contained in:
Sam Leffler
2022-08-16 16:17:14 +00:00
parent a5ca02b0e7
commit 0b528c2a59
2 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
apps/fibonacci/fibonacci.c
View File

@@ -22,18 +22,17 @@ char minisel_tls[4096] __attribute__((__aligned__(4096)));
__attribute__((naked)) void _start() { __attribute__((naked)) void _start() {
asm volatile( asm volatile(
".option push \n" ".option push \n"
".option norelax \n" ".option norelax \n"
"la gp, __global_pointer$ \n" "la gp, __global_pointer$ \n"
"la x4, minisel_tls \n" "la x4, minisel_tls \n"
"addi sp,sp,-16 \n" "addi sp,sp,-16 \n"
"sw a0, 12(sp) \n" "sw a0, 12(sp) \n"
"sw a1, 8(sp) \n" "sw a1, 8(sp) \n"
"sw a2, 4(sp) \n" "sw a2, 4(sp) \n"
"sw a3, 0(sp) \n" "sw a3, 0(sp) \n"
".option pop \n" ".option pop \n"
"j main \n" "j main \n");
);
} }
// How many Fibonacci numbers to write to the log. // How many Fibonacci numbers to write to the log.
@@ -57,9 +56,9 @@ void minisel_printf(const char *fmt, ...) {
int printing = 0; int printing = 0;
for (int d = 1000000000; d > 1; d /= 10) { for (int d = 1000000000; d > 1; d /= 10) {
int n = (arg / d) % 10; int n = (arg / d) % 10;
if (printing || n > 0 ) { if (printing || n > 0) {
seL4_DebugPutChar('0' + n); seL4_DebugPutChar('0' + n);
printing = 1; printing = 1;
} }
} }
seL4_DebugPutChar('0' + (arg % 10)); seL4_DebugPutChar('0' + (arg % 10));
@@ -100,7 +99,7 @@ void fibonacci_increment(fibonacci_state_t *state) {
} }
void wait(interrupt_count_t interrupt_count_to_wait, void wait(interrupt_count_t interrupt_count_to_wait,
interrupt_count_t *counter) { interrupt_count_t *counter) {
for (interrupt_count_t i = 0; i < interrupt_count_to_wait; ++i) { for (interrupt_count_t i = 0; i < interrupt_count_to_wait; ++i) {
asm volatile("wfi"); asm volatile("wfi");
++*counter; ++*counter;
@@ -125,8 +124,7 @@ uint64_t rdtime(void) {
} }
} }
void fibonacci_log(int pid, void fibonacci_log(int pid, const fibonacci_state_t *fibonacci_state,
const fibonacci_state_t *fibonacci_state,
interrupt_count_t interrupt_count) { interrupt_count_t interrupt_count) {
// TODO(sleffler): bring in snprintf // TODO(sleffler): bring in snprintf
#if 0 #if 0
@@ -138,18 +136,16 @@ void fibonacci_log(int pid,
virtual_seconds(interrupt_count)); virtual_seconds(interrupt_count));
minisel_printf(log_buf); minisel_printf(log_buf);
#else #else
minisel_printf("[%d]: " minisel_printf(
"n == %d; " "[%d]: "
"f == %x; " "n == %d; "
"interrupt_count == %d; " "f == %x; "
"rdtime == %d; " "interrupt_count == %d; "
"virt_sec ~= %d\n", "rdtime == %d; "
pid, "virt_sec ~= %d\n",
(uint32_t)fibonacci_state->n, pid, (uint32_t)fibonacci_state->n, (uint32_t)fibonacci_state->f1,
(uint32_t)fibonacci_state->f1, (uint32_t)interrupt_count, (uint32_t)rdtime(),
(uint32_t)interrupt_count, (uint32_t)virtual_seconds(interrupt_count));
(uint32_t)rdtime(),
(uint32_t)virtual_seconds(interrupt_count));
#endif #endif
} }

25
apps/hello/hello.c
View File

@@ -20,18 +20,17 @@ char minisel_tls[4096] __attribute__((__aligned__(4096)));
__attribute__((naked)) void _start() { __attribute__((naked)) void _start() {
asm volatile( asm volatile(
".option push \n" ".option push \n"
".option norelax \n" ".option norelax \n"
"la gp, __global_pointer$ \n" "la gp, __global_pointer$ \n"
"la x4, minisel_tls \n" "la x4, minisel_tls \n"
"addi sp,sp,-16 \n" "addi sp,sp,-16 \n"
"sw a0, 12(sp) \n" "sw a0, 12(sp) \n"
"sw a1, 8(sp) \n" "sw a1, 8(sp) \n"
"sw a2, 4(sp) \n" "sw a2, 4(sp) \n"
"sw a3, 0(sp) \n" "sw a3, 0(sp) \n"
".option pop \n" ".option pop \n"
"j main \n" "j main \n");
);
} }
// only prints 32-bit "%x" hex values // only prints 32-bit "%x" hex values
@@ -61,7 +60,7 @@ int main(int a0, int a1, int a2, int a3) {
minisel_printf("\na0 %x a1 %x a2 %x a3 %x\n", a0, a1, a2, a3); minisel_printf("\na0 %x a1 %x a2 %x a3 %x\n", a0, a1, a2, a3);
minisel_printf("Done, sleeping in WFI loop\n"); minisel_printf("Done, sleeping in WFI loop\n");
while(1) { while (1) {
asm("wfi"); asm("wfi");
} }
} }