Skip to content

Commit 7e5d4df

Browse files
authored
Merge pull request #535 from F0bes/crt-bss-init
crt0: Fix bss init routine
2 parents 08181ea + 5c7f5d9 commit 7e5d4df

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

ee/startup/src/crt0.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ static struct sargs_start *args_start;
4343
void __start(struct sargs_start *pargs)
4444
{
4545
asm volatile(
46-
"# Clear bss area"
47-
"la $2, _fbss"
48-
"la $3, _end"
49-
"1:"
50-
"sltu $1, $2, $3"
51-
"beq $1, $0, 2f"
52-
"nop"
53-
"sq $0, ($2)"
54-
"addiu $2, $2, 16"
55-
"j 1b"
56-
"nop"
57-
"2:"
58-
" \n"
46+
"# Clear bss area \n"
47+
"la $2, _fbss \n"
48+
"la $3, _end \n"
49+
"1: \n"
50+
"sltu $1, $2, $3 \n"
51+
"beq $1, $0, 2f \n"
52+
"nop \n"
53+
"sq $0, ($2) \n"
54+
"addiu $2, $2, 16 \n"
55+
"j 1b \n"
56+
"nop \n"
57+
"2: \n"
58+
" \n"
5959
"# Save first argument \n"
60-
"la $2, %0 \n"
60+
"la $2, %0 \n"
6161
"sw $4, ($2) \n"
6262
" \n"
6363
"# SetupThread \n"
@@ -71,10 +71,10 @@ void __start(struct sargs_start *pargs)
7171
"syscall \n"
7272
"move $sp, $2 \n"
7373
" \n"
74-
"# Jump to _main \n"
75-
"j %2 \n"
76-
: /* No outputs. */
77-
: "R"(args_start), "R"(args), "Csy"(_main));
74+
"# Jump to _main \n"
75+
"j %2 \n"
76+
: /* No outputs. */
77+
: "R"(args_start), "R"(args), "Csy"(_main));
7878
}
7979

8080
/*
@@ -95,14 +95,14 @@ static void _main()
9595
// NOTE: this call can restart the application
9696
if (_ps2sdk_memory_init)
9797
_ps2sdk_memory_init();
98-
98+
9999
// Use arguments sent through start if sent (by ps2link for instance)
100100
pa = &args;
101101
if (args.argc == 0 && args_start != NULL && args_start->args.argc != 0)
102102
pa = &args_start->args;
103103

104104
// call libcglue argument parsing
105-
_libcglue_args_parse(pa->argc, pa->argv);
105+
_libcglue_args_parse(pa->argc, pa->argv);
106106

107107
// initialize libcglue
108108
_libcglue_init();
@@ -133,7 +133,7 @@ static void _main()
133133

134134
noreturn void _exit(int status)
135135
{
136-
// call global destructors (weak)
136+
// call global destructors (weak)
137137
if (_fini)
138138
_fini();
139139

@@ -142,4 +142,4 @@ noreturn void _exit(int status)
142142

143143
// Exit
144144
Exit(status);
145-
}
145+
}

0 commit comments

Comments
 (0)