Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
K
kernel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
kernel
Commits
236b2f0e
Commit
236b2f0e
authored
8 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Panic upon use of unsupported flags
parent
356ba325
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
syscall/process.rs
+57
-45
57 additions, 45 deletions
syscall/process.rs
with
57 additions
and
45 deletions
syscall/process.rs
+
57
−
45
View file @
236b2f0e
...
@@ -46,6 +46,10 @@ pub fn brk(address: usize) -> Result<usize> {
...
@@ -46,6 +46,10 @@ pub fn brk(address: usize) -> Result<usize> {
}
}
}
}
pub
const
CLONE_VM
:
usize
=
0x100
;
pub
const
CLONE_FS
:
usize
=
0x200
;
pub
const
CLONE_FILES
:
usize
=
0x400
;
pub
const
CLONE_VFORK
:
usize
=
0x4000
;
pub
fn
clone
(
flags
:
usize
,
stack_base
:
usize
)
->
Result
<
usize
>
{
pub
fn
clone
(
flags
:
usize
,
stack_base
:
usize
)
->
Result
<
usize
>
{
//TODO: Implement flags
//TODO: Implement flags
//TODO: Copy on write?
//TODO: Copy on write?
...
@@ -78,38 +82,42 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<usize> {
...
@@ -78,38 +82,42 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<usize> {
kstack_option
=
Some
(
new_stack
);
kstack_option
=
Some
(
new_stack
);
}
}
for
memory
in
context
.image
.iter
()
{
if
flags
&
CLONE_VM
==
CLONE_VM
{
let
mut
new_memory
=
context
::
memory
::
Memory
::
new
(
panic!
(
"unimplemented: CLONE_VM"
);
VirtualAddress
::
new
(
memory
.start_address
()
.get
()
+
arch
::
USER_TMP_OFFSET
),
}
else
{
memory
.size
(),
for
memory
in
context
.image
.iter
()
{
entry
::
PRESENT
|
entry
::
NO_EXECUTE
|
entry
::
WRITABLE
,
let
mut
new_memory
=
context
::
memory
::
Memory
::
new
(
true
,
VirtualAddress
::
new
(
memory
.start_address
()
.get
()
+
arch
::
USER_TMP_OFFSET
),
false
memory
.size
(),
);
entry
::
PRESENT
|
entry
::
NO_EXECUTE
|
entry
::
WRITABLE
,
unsafe
{
true
,
arch
::
externs
::
memcpy
(
new_memory
.start_address
()
.get
()
as
*
mut
u8
,
false
memory
.start_address
()
.get
()
as
*
const
u8
,
);
memory
.size
());
unsafe
{
arch
::
externs
::
memcpy
(
new_memory
.start_address
()
.get
()
as
*
mut
u8
,
memory
.start_address
()
.get
()
as
*
const
u8
,
memory
.size
());
}
new_memory
.remap
(
memory
.flags
(),
true
);
image
.push
(
new_memory
);
}
}
new_memory
.remap
(
memory
.flags
(),
true
);
image
.push
(
new_memory
);
}
if
let
Some
(
ref
heap
)
=
context
.heap
{
if
let
Some
(
ref
heap
)
=
context
.heap
{
let
mut
new_heap
=
context
::
memory
::
Memory
::
new
(
let
mut
new_heap
=
context
::
memory
::
Memory
::
new
(
VirtualAddress
::
new
(
arch
::
USER_TMP_HEAP_OFFSET
),
VirtualAddress
::
new
(
arch
::
USER_TMP_HEAP_OFFSET
),
heap
.size
(),
heap
.size
(),
entry
::
PRESENT
|
entry
::
NO_EXECUTE
|
entry
::
WRITABLE
,
entry
::
PRESENT
|
entry
::
NO_EXECUTE
|
entry
::
WRITABLE
,
true
,
true
,
false
false
);
);
unsafe
{
unsafe
{
arch
::
externs
::
memcpy
(
new_heap
.start_address
()
.get
()
as
*
mut
u8
,
arch
::
externs
::
memcpy
(
new_heap
.start_address
()
.get
()
as
*
mut
u8
,
heap
.start_address
()
.get
()
as
*
const
u8
,
heap
.start_address
()
.get
()
as
*
const
u8
,
heap
.size
());
heap
.size
());
}
new_heap
.remap
(
heap
.flags
(),
true
);
heap_option
=
Some
(
new_heap
);
}
}
new_heap
.remap
(
heap
.flags
(),
true
);
heap_option
=
Some
(
new_heap
);
}
}
if
let
Some
(
ref
stack
)
=
context
.stack
{
if
let
Some
(
ref
stack
)
=
context
.stack
{
...
@@ -129,24 +137,28 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<usize> {
...
@@ -129,24 +137,28 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<usize> {
stack_option
=
Some
(
new_stack
);
stack_option
=
Some
(
new_stack
);
}
}
for
(
fd
,
file_option
)
in
context
.files
.iter
()
.enumerate
()
{
if
flags
&
CLONE_FILES
==
CLONE_FILES
{
if
let
Some
(
file
)
=
*
file_option
{
panic!
(
"unimplemented: CLONE_FILES"
);
let
result
=
{
}
else
{
let
schemes
=
scheme
::
schemes
();
for
(
fd
,
file_option
)
in
context
.files
.iter
()
.enumerate
()
{
let
scheme_mutex
=
schemes
.get
(
file
.scheme
)
.ok_or
(
Error
::
BadFile
)
?
;
if
let
Some
(
file
)
=
*
file_option
{
let
result
=
scheme_mutex
.lock
()
.dup
(
file
.number
);
let
result
=
{
result
let
schemes
=
scheme
::
schemes
();
};
let
scheme_mutex
=
schemes
.get
(
file
.scheme
)
.ok_or
(
Error
::
BadFile
)
?
;
match
result
{
let
result
=
scheme_mutex
.lock
()
.dup
(
file
.number
);
Ok
(
new_number
)
=>
{
result
files
.push
(
Some
(
context
::
file
::
File
{
scheme
:
file
.scheme
,
number
:
new_number
}));
};
},
match
result
{
Err
(
err
)
=>
{
Ok
(
new_number
)
=>
{
println!
(
"clone: failed to dup {}: {:?}"
,
fd
,
err
);
files
.push
(
Some
(
context
::
file
::
File
{
scheme
:
file
.scheme
,
number
:
new_number
}));
},
Err
(
err
)
=>
{
println!
(
"clone: failed to dup {}: {:?}"
,
fd
,
err
);
}
}
}
}
else
{
files
.push
(
None
);
}
}
}
else
{
files
.push
(
None
);
}
}
}
}
}
}
...
...
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