Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
09bcc204
There was an error fetching the commit references. Please try again later.
Commit
09bcc204
authored
7 years ago
by
Rozlette
Browse files
Options
Downloads
Patches
Plain Diff
nso: Modify .bss size calculation logic
parent
8b097aa1
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/core/loader/nso.cpp
+7
-3
7 additions, 3 deletions
src/core/loader/nso.cpp
with
7 additions
and
3 deletions
src/core/loader/nso.cpp
+
7
−
3
View file @
09bcc204
...
...
@@ -19,7 +19,10 @@ struct NsoSegmentHeader {
u32_le
offset
;
u32_le
location
;
u32_le
size
;
u32_le
alignment
;
union
{
u32_le
alignment
;
u32_le
bss_size
;
};
};
static_assert
(
sizeof
(
NsoSegmentHeader
)
==
0x10
,
"NsoSegmentHeader has incorrect size."
);
...
...
@@ -120,14 +123,15 @@ VAddr AppLoader_NSO::LoadNso(const std::string& path, VAddr load_base, bool relo
// Read MOD header
ModHeader
mod_header
{};
u32
bss_size
{
Memory
::
PAGE_SIZE
};
// Default .bss to page size if MOD0 section doesn't exist
// Default .bss to size in segment header if MOD0 section doesn't exist
u32
bss_size
{
PageAlignSize
(
nso_header
.
segments
[
2
].
bss_size
)};
std
::
memcpy
(
&
mod_header
,
program_image
.
data
()
+
module_offset
,
sizeof
(
ModHeader
));
const
bool
has_mod_header
{
mod_header
.
magic
==
Common
::
MakeMagic
(
'M'
,
'O'
,
'D'
,
'0'
)};
if
(
has_mod_header
)
{
// Resize program image to include .bss section and page align each section
bss_size
=
PageAlignSize
(
mod_header
.
bss_end_offset
-
mod_header
.
bss_start_offset
);
codeset
->
data
.
size
+=
bss_size
;
}
codeset
->
data
.
size
+=
bss_size
;
const
u32
image_size
{
PageAlignSize
(
static_cast
<
u32
>
(
program_image
.
size
())
+
bss_size
)};
program_image
.
resize
(
image_size
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment