6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-26 18:20:39 +00:00
Code Issues Projects Releases Wiki Activity

Unbreak the build from r239740.

Browse Source 
Do not re-use an enum name as a field name.  Some bots don't like this.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239746 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sanjoy Das
2015-06-15 19:29:44 +00:00
parent cf9ca4fd5d
commit 18a05df213
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/FaultMaps.rst
View File

@@ -47,7 +47,7 @@ The format of this section is
uint32 : NumFaultingPCs uint32 : NumFaultingPCs
uint32 : Reserved (expected to be 0) uint32 : Reserved (expected to be 0)
FunctionFaultInfo[NumFaultingPCs] { FunctionFaultInfo[NumFaultingPCs] {
uint32 : FaultType = FaultMaps::FaultingLoad (only legal value currently) uint32 : FaultKind = FaultMaps::FaultingLoad (only legal value currently)
uint32 : FaultingPCOffset uint32 : FaultingPCOffset
uint32 : handlerPCOffset uint32 : handlerPCOffset
} }

14
include/llvm/CodeGen/FaultMaps.h
View File

@@ -25,30 +25,30 @@ class MCStreamer;
class FaultMaps { class FaultMaps {
public: public:
enum FaultType { FaultingLoad = 1, FaultTypeMax }; enum FaultKind { FaultingLoad = 1, FaultKindMax };
static const char *faultTypeToString(FaultType); static const char *faultTypeToString(FaultKind);
explicit FaultMaps(AsmPrinter &AP); explicit FaultMaps(AsmPrinter &AP);
void recordFaultingOp(FaultType FaultTy, const MCSymbol *HandlerLabel); void recordFaultingOp(FaultKind FaultTy, const MCSymbol *HandlerLabel);
void serializeToFaultMapSection(); void serializeToFaultMapSection();
private: private:
static const char *WFMP; static const char *WFMP;
struct FaultInfo { struct FaultInfo {
FaultType FaultType; FaultKind Kind;
const MCExpr *FaultingOffsetExpr; const MCExpr *FaultingOffsetExpr;
const MCExpr *HandlerOffsetExpr; const MCExpr *HandlerOffsetExpr;
FaultInfo() FaultInfo()
: FaultType(FaultTypeMax), FaultingOffsetExpr(nullptr), : Kind(FaultKindMax), FaultingOffsetExpr(nullptr),
HandlerOffsetExpr(nullptr) {} HandlerOffsetExpr(nullptr) {}
explicit FaultInfo(FaultMaps::FaultType FType, const MCExpr *FaultingOffset, explicit FaultInfo(FaultMaps::FaultKind Kind, const MCExpr *FaultingOffset,
const MCExpr *HandlerOffset) const MCExpr *HandlerOffset)
: FaultType(FType), FaultingOffsetExpr(FaultingOffset), : Kind(Kind), FaultingOffsetExpr(FaultingOffset),
HandlerOffsetExpr(HandlerOffset) {} HandlerOffsetExpr(HandlerOffset) {}
}; };

8
lib/CodeGen/FaultMaps.cpp
View File

@@ -25,7 +25,7 @@ const char *FaultMaps::WFMP = "Fault Maps: ";
FaultMaps::FaultMaps(AsmPrinter &AP) : AP(AP) {} FaultMaps::FaultMaps(AsmPrinter &AP) : AP(AP) {}
void FaultMaps::recordFaultingOp(FaultType FaultTy, void FaultMaps::recordFaultingOp(FaultKind FaultTy,
const MCSymbol *HandlerLabel) { const MCSymbol *HandlerLabel) {
MCContext &OutContext = AP.OutStreamer->getContext(); MCContext &OutContext = AP.OutStreamer->getContext();
MCSymbol *FaultingLabel = OutContext.createTempSymbol(); MCSymbol *FaultingLabel = OutContext.createTempSymbol();
@@ -89,8 +89,8 @@ void FaultMaps::emitFunctionInfo(const MCSymbol *FnLabel,
for (auto &Fault : FFI) { for (auto &Fault : FFI) {
DEBUG(dbgs() << WFMP << " fault type: " DEBUG(dbgs() << WFMP << " fault type: "
<< faultTypeToString(Fault.FaultType) << "\n"); << faultTypeToString(Fault.Kind) << "\n");
OS.EmitIntValue(Fault.FaultType, 4); OS.EmitIntValue(Fault.Kind, 4);
DEBUG(dbgs() << WFMP << " faulting PC offset: " DEBUG(dbgs() << WFMP << " faulting PC offset: "
<< *Fault.FaultingOffsetExpr << "\n"); << *Fault.FaultingOffsetExpr << "\n");
@@ -103,7 +103,7 @@ void FaultMaps::emitFunctionInfo(const MCSymbol *FnLabel,
} }
const char *FaultMaps::faultTypeToString(FaultMaps::FaultType FT) { const char *FaultMaps::faultTypeToString(FaultMaps::FaultKind FT) {
switch (FT) { switch (FT) {
default: default:
llvm_unreachable("unhandled fault type!"); llvm_unreachable("unhandled fault type!");