Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-24 13:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix neg constant

Browse Source
This commit is contained in:
blueloveTH 2023-02-13 18:06:52 +08:00
parent 6067436e46
commit ce0ba313d1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/codeobject.h
View File

@ -65,6 +65,8 @@ struct CodeObject {
std::vector<CodeBlock> blocks = { CodeBlock{NO_BLOCK, -1} }; std::vector<CodeBlock> blocks = { CodeBlock{NO_BLOCK, -1} };
emhash8::HashMap<Str, int> labels; emhash8::HashMap<Str, int> labels;
void optimize(VM* vm);
bool add_label(const Str& label){ bool add_label(const Str& label){
if(labels.contains(label)) return false; if(labels.contains(label)) return false;
labels[label] = codes.size(); labels[label] = codes.size();
@ -86,8 +88,6 @@ struct CodeObject {
return consts.size() - 1; return consts.size() - 1;
} }
void optimize(VM* vm);
/************************************************/ /************************************************/
int _curr_block_i = 0; int _curr_block_i = 0;
bool _rvalue = false; bool _rvalue = false;

9
src/vm.h
View File

@ -1129,9 +1129,10 @@ PyVar pkpy::NativeFunc::operator()(VM* vm, const pkpy::Args& args) const{
void CodeObject::optimize(VM* vm){ void CodeObject::optimize(VM* vm){
for(int i=1; i<codes.size(); i++){ for(int i=1; i<codes.size(); i++){
if(codes[i].op == OP_UNARY_NEGATIVE && codes[i-1].op == OP_LOAD_CONST){ if(codes[i].op == OP_UNARY_NEGATIVE && codes[i-1].op == OP_LOAD_CONST){
codes[i].op = OP_NO_OP; codes[i].op = OP_NO_OP;
int pos = codes[i-1].arg; int pos = codes[i-1].arg;
consts[pos] = vm->num_negated(consts[pos]); consts[pos] = vm->num_negated(consts[pos]);
}
} }
} }