andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make engine* and friends be const pointers in production. (#3564) 

This allows the compiler to see through the pointer and make accesses faster.
It saves 1336 bytes of text.
This commit is contained in:
Scott Smith 2021-11-17 00:53:17 -08:00 committed by GitHub
parent 8dbdeb7773
commit 70ad9724c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/algo/engine.h
View File

@ -399,5 +399,7 @@ void doScheduleStopEngine();
// These externs aren't needed for unit tests - everything is injected instead
#if !EFI_UNIT_TEST
extern Engine ___engine;
#endif // EFI_UNIT_TEST
static Engine * const engine = &___engine;
#else // EFI_UNIT_TEST
extern Engine *engine;
#endif // EFI_UNIT_TEST

2
firmware/controllers/algo/engine_configuration.cpp
View File

@ -129,8 +129,6 @@ static engine_configuration_s activeConfigurationLocalStorage;
engine_configuration_s & activeConfiguration = activeConfigurationLocalStorage;
#endif /* EFI_ACTIVE_CONFIGURATION_IN_FLASH */
extern engine_configuration_s *engineConfiguration;
void rememberCurrentConfiguration() {
#if ! EFI_ACTIVE_CONFIGURATION_IN_FLASH
memcpy(&activeConfiguration, engineConfiguration, sizeof(engine_configuration_s));

6
firmware/controllers/algo/engine_configuration.h
View File

@ -65,9 +65,13 @@ void setBoardConfigOverrides(void);
#if !EFI_UNIT_TEST
extern persistent_config_container_s persistentState;
#endif // EFI_UNIT_TEST
static engine_configuration_s * const engineConfiguration =
&persistentState.persistentConfiguration.engineConfiguration;
static persistent_config_s * const config = &persistentState.persistentConfiguration;
#else // EFI_UNIT_TEST
extern engine_configuration_s *engineConfiguration;
extern persistent_config_s *config;
#endif // EFI_UNIT_TEST
/**
* & is reference in C++ (not C)

1
firmware/controllers/engine_controller.cpp
View File

@ -98,7 +98,6 @@
* Would love to pass reference to configuration object into constructor but C++ does allow attributes after parenthesized initializer
*/
Engine ___engine CCM_OPTIONAL;
Engine * engine = &___engine;
#else // EFI_UNIT_TEST

4
firmware/controllers/flash_main.cpp
View File

@ -29,10 +29,6 @@
static bool needToWriteConfiguration = false;
extern persistent_config_container_s persistentState;
extern engine_configuration_s *engineConfiguration;
/* if we store settings externally */
#if EFI_STORAGE_EXT_SNOR == TRUE

9
firmware/controllers/persistent_store.cpp
View File

@ -29,15 +29,6 @@
persistent_config_container_s persistentState CCM_OPTIONAL;
persistent_config_s *config = &persistentState.persistentConfiguration;
/**
* todo: it really looks like these fields should become 'static', i.e. private
* the whole 'extern ...' pattern is less then perfect, I guess the 'God object' Engine
* would be a smaller evil. Whatever is needed should be passed into methods/modules/files as an explicit parameter.
*/
engine_configuration_s *engineConfiguration = &persistentState.persistentConfiguration.engineConfiguration;
#else // EFI_UNIT_TEST
persistent_config_s * config;

4
firmware/controllers/settings.cpp
View File

@ -50,8 +50,6 @@ void printSpiState(const engine_configuration_s *engineConfiguration) {
boolToString(engineConfiguration->is_enabled_spi_4));
}
extern engine_configuration_s *engineConfiguration;
static void printOutputs(const engine_configuration_s *engineConfiguration) {
efiPrintf("injectionPins: mode %s", getPin_output_mode_e(engineConfiguration->injectionPinMode));
for (size_t i = 0; i < engineConfiguration->specs.cylindersCount; i++) {
@ -1220,7 +1218,7 @@ void initSettings(void) {
// todo: start saving values into flash right away?
addConsoleActionP("showconfig", (VoidPtr) doPrintConfiguration, &engine);
addConsoleAction("showconfig", doPrintConfiguration);
addConsoleAction("tempinfo", printTemperatureInfo);
addConsoleAction("tpsinfo", printTPSInfo);
addConsoleAction("calibrate_tps_1_closed", grabTPSIsClosed);