Subzero. ARM32. Nonsfi.
Adds nonsfi support to the ARM32 backend.
BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=4076
R=stichnot@chromium.org
Review URL: https://codereview.chromium.org/1665263003 .
diff --git a/src/IceGlobalInits.h b/src/IceGlobalInits.h
index 902e335..a111536 100644
--- a/src/IceGlobalInits.h
+++ b/src/IceGlobalInits.h
@@ -20,6 +20,7 @@
#define SUBZERO_SRC_ICEGLOBALINITS_H
#include "IceDefs.h"
+#include "IceFixups.h"
#include "IceGlobalContext.h"
#include "IceIntrinsics.h"
#include "IceOperand.h"
@@ -321,7 +322,16 @@
static std::unique_ptr<RelocInitializer>
create(const GlobalDeclaration *Declaration,
const RelocOffsetArray &OffsetExpr) {
- return makeUnique<RelocInitializer>(Declaration, OffsetExpr);
+ constexpr bool NoFixup = false;
+ return makeUnique<RelocInitializer>(Declaration, OffsetExpr, NoFixup);
+ }
+
+ static std::unique_ptr<RelocInitializer>
+ create(const GlobalDeclaration *Declaration,
+ const RelocOffsetArray &OffsetExpr, FixupKind Fixup) {
+ constexpr bool HasFixup = true;
+ return makeUnique<RelocInitializer>(Declaration, OffsetExpr, HasFixup,
+ Fixup);
}
RelocOffsetT getOffset() const {
@@ -332,6 +342,12 @@
return Offset;
}
+ bool hasFixup() const { return HasFixup; }
+ FixupKind getFixup() const {
+ assert(HasFixup);
+ return Fixup;
+ }
+
const GlobalDeclaration *getDeclaration() const { return Declaration; }
SizeT getNumBytes() const final { return RelocAddrSize; }
void dump(GlobalContext *Ctx, Ostream &Stream) const final;
@@ -344,14 +360,17 @@
ENABLE_MAKE_UNIQUE;
RelocInitializer(const GlobalDeclaration *Declaration,
- const RelocOffsetArray &OffsetExpr)
+ const RelocOffsetArray &OffsetExpr, bool HasFixup,
+ FixupKind Fixup = 0)
: Initializer(RelocInitializerKind),
Declaration(Declaration), // The global declaration used in the reloc.
- OffsetExpr(OffsetExpr) {}
+ OffsetExpr(OffsetExpr), HasFixup(HasFixup), Fixup(Fixup) {}
const GlobalDeclaration *Declaration;
/// The offset to add to the relocation.
const RelocOffsetArray OffsetExpr;
+ const bool HasFixup = false;
+ const FixupKind Fixup = 0;
};
/// Models the list of initializers.
