eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve pointer comparsion for Nevada and Sonora mods 

See #189
This commit is contained in:
Ivan Sokolov 2023-05-25 21:19:47 +08:00
parent 62c5c4757c
commit 95f023c98c
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/interpreter.cc
View File

@ -1131,7 +1131,12 @@ static void opConditionalOperatorLessThanEquals(Program* program)
case VALUE_TYPE_PTR: case VALUE_TYPE_PTR:
switch (value[0].opcode) { switch (value[0].opcode) {
case VALUE_TYPE_INT: case VALUE_TYPE_INT:
result = (uintptr_t)value[1].pointerValue <= (uintptr_t)value[0].integerValue; if (value[0].integerValue > 0) {
result = (uintptr_t)value[1].pointerValue <= (uintptr_t)value[0].integerValue;
} else {
// (ptr <= int{0 or negative}) means (ptr == nullptr)
result = nullptr == value[1].pointerValue;
}
break; break;
default: default:
assert(false && "Should be unreachable"); assert(false && "Should be unreachable");
@ -1385,7 +1390,12 @@ static void opConditionalOperatorGreaterThan(Program* program)
case VALUE_TYPE_PTR: case VALUE_TYPE_PTR:
switch (value[0].opcode) { switch (value[0].opcode) {
case VALUE_TYPE_INT: case VALUE_TYPE_INT:
result = (uintptr_t)value[1].pointerValue > (uintptr_t)value[0].integerValue; if (value[0].integerValue > 0) {
result = (uintptr_t)value[1].pointerValue > (uintptr_t)value[0].integerValue;
} else {
// (ptr > int{0 or negative}) means (ptr != nullptr)
result = nullptr != value[1].pointerValue;
}
break; break;
default: default:
assert(false && "Should be unreachable"); assert(false && "Should be unreachable");

1
src/interpreter.h
View File

@ -148,6 +148,7 @@ typedef struct ProgramValue {
void* pointerValue; void* pointerValue;
}; };
ProgramValue() : opcode(0), pointerValue(nullptr) {}
bool isEmpty(); bool isEmpty();
bool isInt(); bool isInt();
bool isFloat(); bool isFloat();