From fd506f551d2ca89cb757c75faf87809d9d07548d Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 23 Apr 2003 19:55:35 +0000 Subject: [PATCH] Fix a problem with setcc instructions and pointers git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5886 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/Interpreter/Execution.cpp | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp index 6542111709c..9d5166dab81 100644 --- a/lib/ExecutionEngine/Interpreter/Execution.cpp +++ b/lib/ExecutionEngine/Interpreter/Execution.cpp @@ -348,6 +348,15 @@ static GenericValue executeXorInst(GenericValue Src1, GenericValue Src2, #define IMPLEMENT_SETCC(OP, TY) \ case Type::TY##TyID: Dest.BoolVal = Src1.TY##Val OP Src2.TY##Val; break +// Handle pointers specially because they must be compared with only as much +// width as the host has. We _do not_ want to be comparing 64 bit values when +// running on a 32-bit target, otherwise the upper 32 bits might mess up +// comparisons if they contain garbage. +#define IMPLEMENT_POINTERSETCC(OP) \ + case Type::PointerTyID: \ + Dest.BoolVal = (void*)(intptr_t)Src1.PointerVal OP \ + (void*)(intptr_t)Src2.PointerVal; break + static GenericValue executeSetEQInst(GenericValue Src1, GenericValue Src2, const Type *Ty) { GenericValue Dest; @@ -362,7 +371,7 @@ static GenericValue executeSetEQInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(==, Long); IMPLEMENT_SETCC(==, Float); IMPLEMENT_SETCC(==, Double); - IMPLEMENT_SETCC(==, Pointer); + IMPLEMENT_POINTERSETCC(==); default: std::cout << "Unhandled type for SetEQ instruction: " << *Ty << "\n"; abort(); @@ -384,7 +393,7 @@ static GenericValue executeSetNEInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(!=, Long); IMPLEMENT_SETCC(!=, Float); IMPLEMENT_SETCC(!=, Double); - IMPLEMENT_SETCC(!=, Pointer); + IMPLEMENT_POINTERSETCC(!=); default: std::cout << "Unhandled type for SetNE instruction: " << *Ty << "\n"; @@ -407,7 +416,7 @@ static GenericValue executeSetLEInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(<=, Long); IMPLEMENT_SETCC(<=, Float); IMPLEMENT_SETCC(<=, Double); - IMPLEMENT_SETCC(<=, Pointer); + IMPLEMENT_POINTERSETCC(<=); default: std::cout << "Unhandled type for SetLE instruction: " << Ty << "\n"; abort(); @@ -429,7 +438,7 @@ static GenericValue executeSetGEInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(>=, Long); IMPLEMENT_SETCC(>=, Float); IMPLEMENT_SETCC(>=, Double); - IMPLEMENT_SETCC(>=, Pointer); + IMPLEMENT_POINTERSETCC(>=); default: std::cout << "Unhandled type for SetGE instruction: " << *Ty << "\n"; abort(); @@ -451,7 +460,7 @@ static GenericValue executeSetLTInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(<, Long); IMPLEMENT_SETCC(<, Float); IMPLEMENT_SETCC(<, Double); - IMPLEMENT_SETCC(<, Pointer); + IMPLEMENT_POINTERSETCC(<); default: std::cout << "Unhandled type for SetLT instruction: " << *Ty << "\n"; abort(); @@ -473,7 +482,7 @@ static GenericValue executeSetGTInst(GenericValue Src1, GenericValue Src2, IMPLEMENT_SETCC(>, Long); IMPLEMENT_SETCC(>, Float); IMPLEMENT_SETCC(>, Double); - IMPLEMENT_SETCC(>, Pointer); + IMPLEMENT_POINTERSETCC(>); default: std::cout << "Unhandled type for SetGT instruction: " << *Ty << "\n"; abort(); -- 2.34.1