Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
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
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
707f16b0
Commit
707f16b0
authored
Mar 24, 2017
by
Damien George
Browse files
Options
Downloads
Patches
Plain Diff
py: Use mp_locals/mp_globals accessor funcs instead of MP_STATE_CTX.
To improve maintainability of the code.
parent
f4ee1ba9
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
py/runtime.c
+9
-8
9 additions, 8 deletions
py/runtime.c
py/vm.c
+8
-8
8 additions, 8 deletions
py/vm.c
with
17 additions
and
16 deletions
py/runtime.c
+
9
−
8
View file @
707f16b0
...
@@ -97,7 +97,8 @@ void mp_init(void) {
...
@@ -97,7 +97,8 @@ void mp_init(void) {
mp_obj_dict_store
(
MP_OBJ_FROM_PTR
(
&
MP_STATE_VM
(
dict_main
)),
MP_OBJ_NEW_QSTR
(
MP_QSTR___name__
),
MP_OBJ_NEW_QSTR
(
MP_QSTR___main__
));
mp_obj_dict_store
(
MP_OBJ_FROM_PTR
(
&
MP_STATE_VM
(
dict_main
)),
MP_OBJ_NEW_QSTR
(
MP_QSTR___name__
),
MP_OBJ_NEW_QSTR
(
MP_QSTR___main__
));
// locals = globals for outer module (see Objects/frameobject.c/PyFrame_New())
// locals = globals for outer module (see Objects/frameobject.c/PyFrame_New())
MP_STATE_CTX
(
dict_locals
)
=
MP_STATE_CTX
(
dict_globals
)
=
&
MP_STATE_VM
(
dict_main
);
mp_locals_set
(
&
MP_STATE_VM
(
dict_main
));
mp_globals_set
(
&
MP_STATE_VM
(
dict_main
));
#if MICROPY_CAN_OVERRIDE_BUILTINS
#if MICROPY_CAN_OVERRIDE_BUILTINS
// start with no extensions to builtins
// start with no extensions to builtins
...
@@ -136,8 +137,8 @@ mp_obj_t mp_load_name(qstr qst) {
...
@@ -136,8 +137,8 @@ mp_obj_t mp_load_name(qstr qst) {
// logic: search locals, globals, builtins
// logic: search locals, globals, builtins
DEBUG_OP_printf
(
"load name %s
\n
"
,
qstr_str
(
qst
));
DEBUG_OP_printf
(
"load name %s
\n
"
,
qstr_str
(
qst
));
// If we're at the outer scope (locals == globals), dispatch to load_global right away
// If we're at the outer scope (locals == globals), dispatch to load_global right away
if
(
MP_STATE_CTX
(
dict_locals
)
!=
MP_STATE_CTX
(
dict
_globals
))
{
if
(
mp_locals_get
()
!=
mp
_globals
_get
(
))
{
mp_map_elem_t
*
elem
=
mp_map_lookup
(
&
MP_STATE_CTX
(
dict
_locals
)
->
map
,
MP_OBJ_NEW_QSTR
(
qst
),
MP_MAP_LOOKUP
);
mp_map_elem_t
*
elem
=
mp_map_lookup
(
&
mp
_locals
_get
(
)
->
map
,
MP_OBJ_NEW_QSTR
(
qst
),
MP_MAP_LOOKUP
);
if
(
elem
!=
NULL
)
{
if
(
elem
!=
NULL
)
{
return
elem
->
value
;
return
elem
->
value
;
}
}
...
@@ -148,7 +149,7 @@ mp_obj_t mp_load_name(qstr qst) {
...
@@ -148,7 +149,7 @@ mp_obj_t mp_load_name(qstr qst) {
mp_obj_t
mp_load_global
(
qstr
qst
)
{
mp_obj_t
mp_load_global
(
qstr
qst
)
{
// logic: search globals, builtins
// logic: search globals, builtins
DEBUG_OP_printf
(
"load global %s
\n
"
,
qstr_str
(
qst
));
DEBUG_OP_printf
(
"load global %s
\n
"
,
qstr_str
(
qst
));
mp_map_elem_t
*
elem
=
mp_map_lookup
(
&
MP_STATE_CTX
(
dict
_globals
)
->
map
,
MP_OBJ_NEW_QSTR
(
qst
),
MP_MAP_LOOKUP
);
mp_map_elem_t
*
elem
=
mp_map_lookup
(
&
mp
_globals
_get
(
)
->
map
,
MP_OBJ_NEW_QSTR
(
qst
),
MP_MAP_LOOKUP
);
if
(
elem
==
NULL
)
{
if
(
elem
==
NULL
)
{
#if MICROPY_CAN_OVERRIDE_BUILTINS
#if MICROPY_CAN_OVERRIDE_BUILTINS
if
(
MP_STATE_VM
(
mp_module_builtins_override_dict
)
!=
NULL
)
{
if
(
MP_STATE_VM
(
mp_module_builtins_override_dict
)
!=
NULL
)
{
...
@@ -188,24 +189,24 @@ mp_obj_t mp_load_build_class(void) {
...
@@ -188,24 +189,24 @@ mp_obj_t mp_load_build_class(void) {
void
mp_store_name
(
qstr
qst
,
mp_obj_t
obj
)
{
void
mp_store_name
(
qstr
qst
,
mp_obj_t
obj
)
{
DEBUG_OP_printf
(
"store name %s <- %p
\n
"
,
qstr_str
(
qst
),
obj
);
DEBUG_OP_printf
(
"store name %s <- %p
\n
"
,
qstr_str
(
qst
),
obj
);
mp_obj_dict_store
(
MP_OBJ_FROM_PTR
(
MP_STATE_CTX
(
dict
_locals
)),
MP_OBJ_NEW_QSTR
(
qst
),
obj
);
mp_obj_dict_store
(
MP_OBJ_FROM_PTR
(
mp
_locals
_get
(
)),
MP_OBJ_NEW_QSTR
(
qst
),
obj
);
}
}
void
mp_delete_name
(
qstr
qst
)
{
void
mp_delete_name
(
qstr
qst
)
{
DEBUG_OP_printf
(
"delete name %s
\n
"
,
qstr_str
(
qst
));
DEBUG_OP_printf
(
"delete name %s
\n
"
,
qstr_str
(
qst
));
// TODO convert KeyError to NameError if qst not found
// TODO convert KeyError to NameError if qst not found
mp_obj_dict_delete
(
MP_OBJ_FROM_PTR
(
MP_STATE_CTX
(
dict
_locals
)),
MP_OBJ_NEW_QSTR
(
qst
));
mp_obj_dict_delete
(
MP_OBJ_FROM_PTR
(
mp
_locals
_get
(
)),
MP_OBJ_NEW_QSTR
(
qst
));
}
}
void
mp_store_global
(
qstr
qst
,
mp_obj_t
obj
)
{
void
mp_store_global
(
qstr
qst
,
mp_obj_t
obj
)
{
DEBUG_OP_printf
(
"store global %s <- %p
\n
"
,
qstr_str
(
qst
),
obj
);
DEBUG_OP_printf
(
"store global %s <- %p
\n
"
,
qstr_str
(
qst
),
obj
);
mp_obj_dict_store
(
MP_OBJ_FROM_PTR
(
MP_STATE_CTX
(
dict
_globals
)),
MP_OBJ_NEW_QSTR
(
qst
),
obj
);
mp_obj_dict_store
(
MP_OBJ_FROM_PTR
(
mp
_globals
_get
(
)),
MP_OBJ_NEW_QSTR
(
qst
),
obj
);
}
}
void
mp_delete_global
(
qstr
qst
)
{
void
mp_delete_global
(
qstr
qst
)
{
DEBUG_OP_printf
(
"delete global %s
\n
"
,
qstr_str
(
qst
));
DEBUG_OP_printf
(
"delete global %s
\n
"
,
qstr_str
(
qst
));
// TODO convert KeyError to NameError if qst not found
// TODO convert KeyError to NameError if qst not found
mp_obj_dict_delete
(
MP_OBJ_FROM_PTR
(
MP_STATE_CTX
(
dict
_globals
)),
MP_OBJ_NEW_QSTR
(
qst
));
mp_obj_dict_delete
(
MP_OBJ_FROM_PTR
(
mp
_globals
_get
(
)),
MP_OBJ_NEW_QSTR
(
qst
));
}
}
mp_obj_t
mp_unary_op
(
mp_uint_t
op
,
mp_obj_t
arg
)
{
mp_obj_t
mp_unary_op
(
mp_uint_t
op
,
mp_obj_t
arg
)
{
...
...
This diff is collapsed.
Click to expand it.
py/vm.c
+
8
−
8
View file @
707f16b0
...
@@ -285,12 +285,12 @@ dispatch_loop:
...
@@ -285,12 +285,12 @@ dispatch_loop:
DECODE_QSTR
;
DECODE_QSTR
;
mp_obj_t
key
=
MP_OBJ_NEW_QSTR
(
qst
);
mp_obj_t
key
=
MP_OBJ_NEW_QSTR
(
qst
);
mp_uint_t
x
=
*
ip
;
mp_uint_t
x
=
*
ip
;
if
(
x
<
MP_STATE_CTX
(
dict
_locals
)
->
map
.
alloc
&&
MP_STATE_CTX
(
dict
_locals
)
->
map
.
table
[
x
].
key
==
key
)
{
if
(
x
<
mp
_locals
_get
(
)
->
map
.
alloc
&&
mp
_locals
_get
(
)
->
map
.
table
[
x
].
key
==
key
)
{
PUSH
(
MP_STATE_CTX
(
dict
_locals
)
->
map
.
table
[
x
].
value
);
PUSH
(
mp
_locals
_get
(
)
->
map
.
table
[
x
].
value
);
}
else
{
}
else
{
mp_map_elem_t
*
elem
=
mp_map_lookup
(
&
MP_STATE_CTX
(
dict
_locals
)
->
map
,
MP_OBJ_NEW_QSTR
(
qst
),
MP_MAP_LOOKUP
);
mp_map_elem_t
*
elem
=
mp_map_lookup
(
&
mp
_locals
_get
(
)
->
map
,
MP_OBJ_NEW_QSTR
(
qst
),
MP_MAP_LOOKUP
);
if
(
elem
!=
NULL
)
{
if
(
elem
!=
NULL
)
{
*
(
byte
*
)
ip
=
(
elem
-
&
MP_STATE_CTX
(
dict
_locals
)
->
map
.
table
[
0
])
&
0xff
;
*
(
byte
*
)
ip
=
(
elem
-
&
mp
_locals
_get
(
)
->
map
.
table
[
0
])
&
0xff
;
PUSH
(
elem
->
value
);
PUSH
(
elem
->
value
);
}
else
{
}
else
{
PUSH
(
mp_load_name
(
MP_OBJ_QSTR_VALUE
(
key
)));
PUSH
(
mp_load_name
(
MP_OBJ_QSTR_VALUE
(
key
)));
...
@@ -314,12 +314,12 @@ dispatch_loop:
...
@@ -314,12 +314,12 @@ dispatch_loop:
DECODE_QSTR
;
DECODE_QSTR
;
mp_obj_t
key
=
MP_OBJ_NEW_QSTR
(
qst
);
mp_obj_t
key
=
MP_OBJ_NEW_QSTR
(
qst
);
mp_uint_t
x
=
*
ip
;
mp_uint_t
x
=
*
ip
;
if
(
x
<
MP_STATE_CTX
(
dict
_globals
)
->
map
.
alloc
&&
MP_STATE_CTX
(
dict
_globals
)
->
map
.
table
[
x
].
key
==
key
)
{
if
(
x
<
mp
_globals
_get
(
)
->
map
.
alloc
&&
mp
_globals
_get
(
)
->
map
.
table
[
x
].
key
==
key
)
{
PUSH
(
MP_STATE_CTX
(
dict
_globals
)
->
map
.
table
[
x
].
value
);
PUSH
(
mp
_globals
_get
(
)
->
map
.
table
[
x
].
value
);
}
else
{
}
else
{
mp_map_elem_t
*
elem
=
mp_map_lookup
(
&
MP_STATE_CTX
(
dict
_globals
)
->
map
,
MP_OBJ_NEW_QSTR
(
qst
),
MP_MAP_LOOKUP
);
mp_map_elem_t
*
elem
=
mp_map_lookup
(
&
mp
_globals
_get
(
)
->
map
,
MP_OBJ_NEW_QSTR
(
qst
),
MP_MAP_LOOKUP
);
if
(
elem
!=
NULL
)
{
if
(
elem
!=
NULL
)
{
*
(
byte
*
)
ip
=
(
elem
-
&
MP_STATE_CTX
(
dict
_globals
)
->
map
.
table
[
0
])
&
0xff
;
*
(
byte
*
)
ip
=
(
elem
-
&
mp
_globals
_get
(
)
->
map
.
table
[
0
])
&
0xff
;
PUSH
(
elem
->
value
);
PUSH
(
elem
->
value
);
}
else
{
}
else
{
PUSH
(
mp_load_global
(
MP_OBJ_QSTR_VALUE
(
key
)));
PUSH
(
mp_load_global
(
MP_OBJ_QSTR_VALUE
(
key
)));
...
...
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