w1n5t0n/memlnaut-nisps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code made more robust with memory barriers

Browse source
This commit is contained in:
Andrea Martelloni 2025-04-26 11:39:20 +01:00
parent 66f8ad0080
commit 2c8c87b14f
1 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
fmsynthiml.ino
View file

@ -314,7 +314,6 @@ protected:
std::shared_ptr<IMLInterface> interface; std::shared_ptr<IMLInterface> interface;
std::shared_ptr<FMSynthAudioApp> audio_app; std::shared_ptr<FMSynthAudioApp> audio_app;
// Inter-core communication // Inter-core communication
volatile bool core_0_ready = false; volatile bool core_0_ready = false;
volatile bool core_1_ready = false; volatile bool core_1_ready = false;
@ -325,6 +324,11 @@ volatile bool interface_ready = false;
// We're only bound to the joystick inputs (x, y, rotate) // We're only bound to the joystick inputs (x, y, rotate)
const size_t kN_InputParams = 3; const size_t kN_InputParams = 3;
// Add these macros near other globals
#define MEMORY_BARRIER() __sync_synchronize()
#define WRITE_VOLATILE(var, val) do { MEMORY_BARRIER(); (var) = (val); MEMORY_BARRIER(); } while (0)
#define READ_VOLATILE(var) ({ MEMORY_BARRIER(); typeof(var) __temp = (var); MEMORY_BARRIER(); __temp; })
void bind_interface(std::shared_ptr<IMLInterface> interface) void bind_interface(std::shared_ptr<IMLInterface> interface)
{ {
@ -372,25 +376,31 @@ void setup()
Serial.begin(115200); Serial.begin(115200);
while (!Serial) {} while (!Serial) {}
Serial.println("Serial initialised."); Serial.println("Serial initialised.");
serial_ready = 1; WRITE_VOLATILE(serial_ready, true);
// Setup board // Setup board
MEMLNaut::Initialize(); MEMLNaut::Initialize();
// Set LED to blink
pinMode(33, OUTPUT); pinMode(33, OUTPUT);
// Setup interface // Setup interface with memory barrier protection
interface = std::make_shared<IMLInterface>(); {
interface->setup(kN_InputParams, FMSynthAudioApp::kN_Params); auto temp_interface = std::make_shared<IMLInterface>();
interface_ready = true; temp_interface->setup(kN_InputParams, FMSynthAudioApp::kN_Params);
MEMORY_BARRIER();
interface = temp_interface;
MEMORY_BARRIER();
}
WRITE_VOLATILE(interface_ready, true);
// Bind interface to MEMLNaut // Bind interface after ensuring it's fully initialized
bind_interface(interface); bind_interface(interface);
Serial.println("Bound interface to MEMLNaut."); Serial.println("Bound interface to MEMLNaut.");
core_0_ready = true; // Indicate core 0 is ready WRITE_VOLATILE(core_0_ready, true);
while (!core_1_ready) {} while (!READ_VOLATILE(core_1_ready)) {
MEMORY_BARRIER();
delay(1);
}
Serial.println("Finished initialising core 0."); Serial.println("Finished initialising core 0.");
} }
@ -413,19 +423,33 @@ void loop()
void setup1() void setup1()
{ {
while (!serial_ready) {} // Wait for serial to be ready while (!READ_VOLATILE(serial_ready)) {
MEMORY_BARRIER();
delay(1);
}
audio_app = std::make_shared<FMSynthAudioApp>(); while (!READ_VOLATILE(interface_ready)) {
while (!interface_ready); // Wait for interface to be ready MEMORY_BARRIER();
delay(1);
}
audio_app->Setup(AudioDriver::GetSampleRate(), // Create audio app with memory barrier protection
interface); {
auto temp_audio_app = std::make_shared<FMSynthAudioApp>();
temp_audio_app->Setup(AudioDriver::GetSampleRate(), interface);
MEMORY_BARRIER();
audio_app = temp_audio_app;
MEMORY_BARRIER();
}
// Start audio driver // Start audio driver
AudioDriver::Setup(); AudioDriver::Setup();
core_1_ready = true; // Indicate core 1 is ready WRITE_VOLATILE(core_1_ready, true);
while (!core_0_ready) {} while (!READ_VOLATILE(core_0_ready)) {
MEMORY_BARRIER();
delay(1);
}
Serial.println("Finished initialising core 1."); Serial.println("Finished initialising core 1.");
} }