6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-17 21:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Handle upgrade of fp -> ptr cast with fp -> int -> ptr

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32109 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2006-12-01 23:40:53 +00:00
parent baf2ecda5f
commit 280d801839
6 changed files with 522 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

404
tools/llvm-upgrade/UpgradeParser.cpp
View File

File diff suppressed because it is too large Load Diff

404
tools/llvm-upgrade/UpgradeParser.cpp.cvs
View File

File diff suppressed because it is too large Load Diff

2
tools/llvm-upgrade/UpgradeParser.h
View File

@ -281,7 +281,7 @@
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
#line 130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
#line 154 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
typedef union YYSTYPE {
std::string* String;
TypeInfo Type;

2
tools/llvm-upgrade/UpgradeParser.h.cvs
View File

@ -281,7 +281,7 @@
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
#line 130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
#line 154 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
typedef union YYSTYPE {
std::string* String;
TypeInfo Type;

48
tools/llvm-upgrade/UpgradeParser.y
View File

@ -47,7 +47,26 @@ void UpgradeAssembly(const std::string &infile, std::istream& in,
}
}
const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
std::string getCastUpgrade(std::string& Source, TypeInfo& SrcTy,
TypeInfo&DstTy, bool isConst = false)
{
std::string Result;
if (SrcTy.isFloatingPoint() && DstTy.isPointer()) {
if (isConst)
Source = "ulong fptoui(" + Source + " to ulong)";
else {
Result = "%cast_upgrade = fptoui " + Source + " to ulong";
Source = "ulong %cast_upgrade";
}
SrcTy.destroy();
SrcTy.newTy = new std::string("ulong");
SrcTy.oldTy = ULongTy;
}
return Result;
}
const char* getCastOpcode(std::string& Source, TypeInfo& SrcTy,
TypeInfo&DstTy) {
unsigned SrcBits = SrcTy.getBitWidth();
unsigned DstBits = DstTy.getBitWidth();
const char* opcode = "bitcast";
@ -114,6 +133,11 @@ const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
opcode = "bitcast"; // ptr -> ptr
} else if (SrcTy.isIntegral()) {
opcode = "inttoptr"; // int -> ptr
} else if (SrcTy.isFloatingPoint()) { // float/double -> ptr
// Cast to int first
*O << " %upgrade_cast = fptoui " << Source << " to ulong\n";
opcode = "inttoptr";
Source = "ulong %upgrade_cast";
} else {
assert(!"Casting pointer to other than pointer or int");
}
@ -469,10 +493,15 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
ConstExpr: CastOps '(' ConstVal TO Types ')' {
// We must infer the cast opcode from the types of the operands.
const char *opcode = $1->c_str();
if (*$1 == "cast")
opcode = getCastOpcode($3.type, $5);
std::string source = *$3.cnst;
if (*$1 == "cast") {
std::string upgrade = getCastUpgrade(source, $3.type, $5, true);
opcode = getCastOpcode(source, $3.type, $5);
if (!upgrade.empty())
source = upgrade;
}
$$ = new std::string(opcode);
*$$ += "(" + *$3.cnst + " " + *$4 + " " + *$5.newTy + ")";
*$$ += "( " + source + " " + *$4 + " " + *$5.newTy + ")";
delete $1; $3.destroy(); delete $4; $5.destroy();
}
| GETELEMENTPTR '(' ConstVal IndexList ')' {
@ -984,10 +1013,15 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
}
| CastOps ResolvedVal TO Types {
const char *opcode = $1->c_str();
if (*$1 == "cast")
opcode = getCastOpcode($2.type, $4);
std::string source = *$2.val;
if (*$1 == "cast") {
std::string upgrade = getCastUpgrade(source, $2.type, $4, false);
if (!upgrade.empty())
*O << " " << upgrade << "\n";
opcode = getCastOpcode(source, $2.type, $4);
}
$$ = new std::string(opcode);
*$$ += *$2.val + " " + *$3 + " " + *$4.newTy;
*$$ += " " + source + " " + *$3 + " " + *$4.newTy;
delete $1; $2.destroy();
delete $3; $4.destroy();
}

48
tools/llvm-upgrade/UpgradeParser.y.cvs
View File

@ -47,7 +47,26 @@ void UpgradeAssembly(const std::string &infile, std::istream& in,
}
}
const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
std::string getCastUpgrade(std::string& Source, TypeInfo& SrcTy,
TypeInfo&DstTy, bool isConst = false)
{
std::string Result;
if (SrcTy.isFloatingPoint() && DstTy.isPointer()) {
if (isConst)
Source = "ulong fptoui(" + Source + " to ulong)";
else {
Result = "%cast_upgrade = fptoui " + Source + " to ulong";
Source = "ulong %cast_upgrade";
}
SrcTy.destroy();
SrcTy.newTy = new std::string("ulong");
SrcTy.oldTy = ULongTy;
}
return Result;
}
const char* getCastOpcode(std::string& Source, TypeInfo& SrcTy,
TypeInfo&DstTy) {
unsigned SrcBits = SrcTy.getBitWidth();
unsigned DstBits = DstTy.getBitWidth();
const char* opcode = "bitcast";
@ -114,6 +133,11 @@ const char* getCastOpcode(TypeInfo& SrcTy, TypeInfo&DstTy) {
opcode = "bitcast"; // ptr -> ptr
} else if (SrcTy.isIntegral()) {
opcode = "inttoptr"; // int -> ptr
} else if (SrcTy.isFloatingPoint()) { // float/double -> ptr
// Cast to int first
*O << " %upgrade_cast = fptoui " << Source << " to ulong\n";
opcode = "inttoptr";
Source = "ulong %upgrade_cast";
} else {
assert(!"Casting pointer to other than pointer or int");
}
@ -469,10 +493,15 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
ConstExpr: CastOps '(' ConstVal TO Types ')' {
// We must infer the cast opcode from the types of the operands.
const char *opcode = $1->c_str();
if (*$1 == "cast")
opcode = getCastOpcode($3.type, $5);
std::string source = *$3.cnst;
if (*$1 == "cast") {
std::string upgrade = getCastUpgrade(source, $3.type, $5, true);
opcode = getCastOpcode(source, $3.type, $5);
if (!upgrade.empty())
source = upgrade;
}
$$ = new std::string(opcode);
*$$ += "(" + *$3.cnst + " " + *$4 + " " + *$5.newTy + ")";
*$$ += "( " + source + " " + *$4 + " " + *$5.newTy + ")";
delete $1; $3.destroy(); delete $4; $5.destroy();
}
| GETELEMENTPTR '(' ConstVal IndexList ')' {
@ -984,10 +1013,15 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
}
| CastOps ResolvedVal TO Types {
const char *opcode = $1->c_str();
if (*$1 == "cast")
opcode = getCastOpcode($2.type, $4);
std::string source = *$2.val;
if (*$1 == "cast") {
std::string upgrade = getCastUpgrade(source, $2.type, $4, false);
if (!upgrade.empty())
*O << " " << upgrade << "\n";
opcode = getCastOpcode(source, $2.type, $4);
}
$$ = new std::string(opcode);
*$$ += *$2.val + " " + *$3 + " " + *$4.newTy;
*$$ += " " + source + " " + *$3 + " " + *$4.newTy;
delete $1; $2.destroy();
delete $3; $4.destroy();
}