Spiri
/
ROSBuzz_MISTLab
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove return values of init and step from the stack

This commit is contained in:
Giovanni Beltrame 2020-06-15 23:57:04 -04:00
parent 1c9c220856
commit ce38cb6b1d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/buzz_update.cpp
View File

@ -488,6 +488,7 @@ void update_routine()
if (*(int*)updater->mode == CODE_RUNNING) if (*(int*)updater->mode == CODE_RUNNING)
{ {
buzzvm_function_call(VM, "updated_no_bct", 0); buzzvm_function_call(VM, "updated_no_bct", 0);
buzzvm_pop(VM); // Pop return value
// Check for update // Check for update
if (check_update()) if (check_update())
{ {
@ -738,4 +739,4 @@ Patch_packets_received_counter,Patch_request_packets_received,Patch_packets_sent
<< old_byte_code_size << "," << *(size_t*)updater->bcode_size << "," << *(size_t*)updater->patch_size << "," << old_byte_code_size << "," << *(size_t*)updater->bcode_size << "," << *(size_t*)updater->patch_size << ","
<< (int)*(uint8_t*)updater->update_no << "," << (int)packet_id_; << (int)*(uint8_t*)updater->update_no << "," << (int)packet_id_;
}*/ }*/
} }

8
src/buzz_utility.cpp
View File

@ -397,6 +397,8 @@ int buzz_update_set(uint8_t* UP_BO_BUF, const char* bdbg_filename, size_t bcode_
ROS_ERROR("Error in calling init, VM state : %i", VM->state); ROS_ERROR("Error in calling init, VM state : %i", VM->state);
return 0; return 0;
} }
// Pop the init return value
buzzvm_pop(VM);
// All OK // All OK
return 1; return 1;
} }
@ -457,6 +459,8 @@ int buzz_update_init_test(uint8_t* UP_BO_BUF, const char* bdbg_filename, size_t
ROS_ERROR("Error in calling init, VM state : %i", VM->state); ROS_ERROR("Error in calling init, VM state : %i", VM->state);
return 0; return 0;
} }
// Pop init return value
buzzvm_pop(VM);
// All OK // All OK
return 1; return 1;
} }
@ -501,6 +505,8 @@ void buzz_script_step()
ROS_ERROR("%s: execution terminated abnormally: %s", BO_FNAME, buzz_error_info()); ROS_ERROR("%s: execution terminated abnormally: %s", BO_FNAME, buzz_error_info());
buzzvm_dump(VM); buzzvm_dump(VM);
} }
// Pop the step return value
buzzvm_pop(VM);
} }
void buzz_script_destroy() void buzz_script_destroy()
@ -545,6 +551,8 @@ int update_step_test()
buzzuav_closures::buzzuav_update_flight_status(VM); buzzuav_closures::buzzuav_update_flight_status(VM);
int a = buzzvm_function_call(VM, "step", 0); int a = buzzvm_function_call(VM, "step", 0);
// Pop step return value
buzzvm_pop(VM);
if (a != BUZZVM_STATE_READY) if (a != BUZZVM_STATE_READY)
{ {