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
f23e99bb
There was an error fetching the commit references. Please try again later.
Commit
f23e99bb
authored
10 years ago
by
bunnei
Browse files
Options
Downloads
Patches
Plain Diff
added kernel memory to mem_map
parent
92bde183
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/core/mem_map.cpp
+3
-0
3 additions, 0 deletions
src/core/mem_map.cpp
src/core/mem_map.h
+6
-0
6 additions, 0 deletions
src/core/mem_map.h
with
9 additions
and
0 deletions
src/core/mem_map.cpp
+
3
−
0
View file @
f23e99bb
...
@@ -21,6 +21,7 @@ u8* g_heap = NULL; ///< Application heap (main memo
...
@@ -21,6 +21,7 @@ u8* g_heap = NULL; ///< Application heap (main memo
u8
*
g_heap_gsp
=
NULL
;
///< GSP heap (main memory)
u8
*
g_heap_gsp
=
NULL
;
///< GSP heap (main memory)
u8
*
g_vram
=
NULL
;
///< Video memory (VRAM) pointer
u8
*
g_vram
=
NULL
;
///< Video memory (VRAM) pointer
u8
*
g_shared_mem
=
NULL
;
///< Shared memory
u8
*
g_shared_mem
=
NULL
;
///< Shared memory
u8
*
g_kernel_mem
;
///< Kernel memory
u8
*
g_physical_bootrom
=
NULL
;
///< Bootrom physical memory
u8
*
g_physical_bootrom
=
NULL
;
///< Bootrom physical memory
u8
*
g_uncached_bootrom
=
NULL
;
u8
*
g_uncached_bootrom
=
NULL
;
...
@@ -30,6 +31,7 @@ u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM
...
@@ -30,6 +31,7 @@ u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM
u8
*
g_physical_heap_gsp
=
NULL
;
///< GSP heap physical memory
u8
*
g_physical_heap_gsp
=
NULL
;
///< GSP heap physical memory
u8
*
g_physical_vram
=
NULL
;
///< Video physical memory (VRAM)
u8
*
g_physical_vram
=
NULL
;
///< Video physical memory (VRAM)
u8
*
g_physical_shared_mem
=
NULL
;
///< Physical shared memory
u8
*
g_physical_shared_mem
=
NULL
;
///< Physical shared memory
u8
*
g_physical_kernel_mem
;
///< Kernel memory
// We don't declare the IO region in here since its handled by other means.
// We don't declare the IO region in here since its handled by other means.
static
MemoryView
g_views
[]
=
{
static
MemoryView
g_views
[]
=
{
...
@@ -37,6 +39,7 @@ static MemoryView g_views[] = {
...
@@ -37,6 +39,7 @@ static MemoryView g_views[] = {
{
&
g_vram
,
&
g_physical_vram
,
VRAM_VADDR
,
VRAM_SIZE
,
0
},
{
&
g_vram
,
&
g_physical_vram
,
VRAM_VADDR
,
VRAM_SIZE
,
0
},
{
&
g_heap
,
&
g_physical_fcram
,
HEAP_VADDR
,
HEAP_SIZE
,
MV_IS_PRIMARY_RAM
},
{
&
g_heap
,
&
g_physical_fcram
,
HEAP_VADDR
,
HEAP_SIZE
,
MV_IS_PRIMARY_RAM
},
{
&
g_shared_mem
,
&
g_physical_shared_mem
,
SHARED_MEMORY_VADDR
,
SHARED_MEMORY_SIZE
,
0
},
{
&
g_shared_mem
,
&
g_physical_shared_mem
,
SHARED_MEMORY_VADDR
,
SHARED_MEMORY_SIZE
,
0
},
{
&
g_kernel_mem
,
&
g_physical_kernel_mem
,
KERNEL_MEMORY_VADDR
,
KERNEL_MEMORY_SIZE
,
0
},
{
&
g_heap_gsp
,
&
g_physical_heap_gsp
,
HEAP_GSP_VADDR
,
HEAP_GSP_SIZE
,
0
},
{
&
g_heap_gsp
,
&
g_physical_heap_gsp
,
HEAP_GSP_VADDR
,
HEAP_GSP_SIZE
,
0
},
};
};
...
...
This diff is collapsed.
Click to expand it.
src/core/mem_map.h
+
6
−
0
View file @
f23e99bb
...
@@ -37,6 +37,11 @@ enum {
...
@@ -37,6 +37,11 @@ enum {
CONFIG_MEMORY_VADDR_END
=
(
CONFIG_MEMORY_VADDR
+
CONFIG_MEMORY_SIZE
),
CONFIG_MEMORY_VADDR_END
=
(
CONFIG_MEMORY_VADDR
+
CONFIG_MEMORY_SIZE
),
CONFIG_MEMORY_MASK
=
(
CONFIG_MEMORY_SIZE
-
1
),
CONFIG_MEMORY_MASK
=
(
CONFIG_MEMORY_SIZE
-
1
),
KERNEL_MEMORY_SIZE
=
0x00001000
,
///< Kernel memory size
KERNEL_MEMORY_VADDR
=
0xFFFF0000
,
///< Kernel memory where the kthread objects etc are
KERNEL_MEMORY_VADDR_END
=
(
KERNEL_MEMORY_VADDR
+
KERNEL_MEMORY_SIZE
),
KERNEL_MEMORY_MASK
=
(
KERNEL_MEMORY_SIZE
-
1
),
EXEFS_CODE_SIZE
=
0x03F00000
,
EXEFS_CODE_SIZE
=
0x03F00000
,
EXEFS_CODE_VADDR
=
0x00100000
,
///< ExeFS:/.code is loaded here
EXEFS_CODE_VADDR
=
0x00100000
,
///< ExeFS:/.code is loaded here
EXEFS_CODE_VADDR_END
=
(
EXEFS_CODE_VADDR
+
EXEFS_CODE_SIZE
),
EXEFS_CODE_VADDR_END
=
(
EXEFS_CODE_VADDR
+
EXEFS_CODE_SIZE
),
...
@@ -110,6 +115,7 @@ extern u8* g_heap_gsp; ///< GSP heap (main memory)
...
@@ -110,6 +115,7 @@ extern u8* g_heap_gsp; ///< GSP heap (main memory)
extern
u8
*
g_heap
;
///< Application heap (main memory)
extern
u8
*
g_heap
;
///< Application heap (main memory)
extern
u8
*
g_vram
;
///< Video memory (VRAM)
extern
u8
*
g_vram
;
///< Video memory (VRAM)
extern
u8
*
g_shared_mem
;
///< Shared memory
extern
u8
*
g_shared_mem
;
///< Shared memory
extern
u8
*
g_kernel_mem
;
///< Kernel memory
extern
u8
*
g_exefs_code
;
///< ExeFS:/.code is loaded here
extern
u8
*
g_exefs_code
;
///< ExeFS:/.code is loaded here
void
Init
();
void
Init
();
...
...
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