Support inverted inputs in the config.

Author: nicolaimueller

src/Hardware/Read.cpp

@@ -2562,6 +2562,16 @@ void Hardware::Read::SettingsFile(char *InputSettingsFileName, Hardware::Circuit
 
                     Hardware::Read::NonCommentFromFile(SettingsFile, Str1, "%");
 
+					int InvertedInput = 0;
+					if (Str1[0] == '~')
+					{
+						strncpy(Str2, &Str1[1], Max_Name_Length - 2);
+						Str2[Max_Name_Length - 1] = '\0';
+						strncpy(Str1, Str2, Max_Name_Length - 1);
+						Str1[Max_Name_Length - 1] = '\0';
+						InvertedInput = 1;
+					}
+
 					if (strstr(Str1, "group_in") != Str1)
 					{
 						strncpy(Str2, Str1, Max_Name_Length - 1);
@@ -2871,7 +2881,7 @@ void Hardware::Read::SettingsFile(char *InputSettingsFileName, Hardware::Circuit
 							else
 								TempIndex = InitialInputList[NumberOfBuffer_char];
 
-							Settings->InitialSim_Values[ClockCycle][TempIndex]   = ShareIndex;
+							Settings->InitialSim_Values[ClockCycle][TempIndex]   = (ShareIndex << 1) | InvertedInput;
 							Settings->InitialSim_Values[ClockCycle][TempIndex] <<= 32;
 							Settings->InitialSim_Values[ClockCycle][TempIndex]  |= IndexL2 + (j - IndexL);
 							Settings->InitialSim_Values[ClockCycle][TempIndex]  |= GroupInput;

src/Hardware/Simulate.cpp

@@ -51,6 +51,7 @@ void Hardware::Simulate::All(Hardware::LibraryStruct &Library, Hardware::Circuit
 	int GroupIndex;
 	int ValueIndex;
 	int ShareIndex;
+	uint64_t InvertedInput;
 	uint64_t Select[100];
 	int ProbeIndex;
 	std::string ErrorMessage;
@@ -143,9 +144,14 @@ void Hardware::Simulate::All(Hardware::LibraryStruct &Library, Hardware::Circuit
 				if ((Settings.InitialSim_Values[ClockCycle][InputIndex] & GroupInMask) == GroupInput)
 				{
 					ValueIndex = Settings.InitialSim_Values[ClockCycle][InputIndex] & 0xffffffff;
-					ShareIndex = (Settings.InitialSim_Values[ClockCycle][InputIndex] >> 32) & 0xff;
+					InvertedInput = (Settings.InitialSim_Values[ClockCycle][InputIndex] >> 32) & 1;
+					ShareIndex = (Settings.InitialSim_Values[ClockCycle][InputIndex] >> 33) & 0xff;
 
-					SharedData->SignalValues[Settings.InitialSim_Inputs[ClockCycle][InputIndex]] = SharedData->SelectedGroupValues[ValueIndex][ShareIndex];
+					if (InvertedInput){
+						InvertedInput = FullOne;
+					}
+
+					SharedData->SignalValues[Settings.InitialSim_Inputs[ClockCycle][InputIndex]] = InvertedInput ^ SharedData->SelectedGroupValues[ValueIndex][ShareIndex];
 				}
 				else if ((Settings.InitialSim_Values[ClockCycle][InputIndex] & GroupInMask) == SameInput)
 					SharedData->SignalValues[Settings.InitialSim_Inputs[ClockCycle][InputIndex]] = SharedData->LastInitialSimValues[InputIndex];