diff options
Diffstat (limited to 'src/jit/compiler.h')
| -rw-r--r-- | src/jit/compiler.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/jit/compiler.h b/src/jit/compiler.h index 9ca0e1a3e1..998b647702 100644 --- a/src/jit/compiler.h +++ b/src/jit/compiler.h @@ -1218,13 +1218,13 @@ struct fgArgTabEntry regNumber otherRegNum; // The (second) register to use when passing this argument. SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR structDesc; -#elif defined(_TARGET_X86_) +#elif !defined(_TARGET_64BIT_) __declspec(property(get = getIsStruct)) bool isStruct; bool getIsStruct() { return varTypeIsStruct(node); } -#endif // _TARGET_X86_ +#endif // !_TARGET_64BIT_ #ifdef _TARGET_ARM_ void SetIsHfaRegArg(bool hfaRegArg) @@ -2875,13 +2875,10 @@ protected: bool impILConsumesAddr(const BYTE* codeAddr, CORINFO_METHOD_HANDLE fncHandle, CORINFO_MODULE_HANDLE scpHandle); void impResolveToken(const BYTE* addr, CORINFO_RESOLVED_TOKEN* pResolvedToken, CorInfoTokenKind kind); - void impPushOnStackNoType(GenTreePtr tree); void impPushOnStack(GenTreePtr tree, typeInfo ti); - void impPushNullObjRefOnStack(); - StackEntry impPopStack(); - StackEntry impPopStack(CORINFO_CLASS_HANDLE& structTypeRet); - GenTreePtr impPopStack(typeInfo& ti); + void impPushNullObjRefOnStack(); + StackEntry impPopStack(); StackEntry& impStackTop(unsigned n = 0); unsigned impStackHeight(); @@ -9074,6 +9071,10 @@ public: // Is the compilation in a full trust context? bool compIsFullTrust(); +#if MEASURE_NOWAY + void RecordNowayAssert(const char* filename, unsigned line, const char* condStr); +#endif // MEASURE_NOWAY + #ifndef FEATURE_TRACELOGGING // Should we actually fire the noway assert body and the exception handler? bool compShouldThrowOnNoway(); @@ -9475,6 +9476,7 @@ const instruction INS_XOR = INS_eor; const instruction INS_NEG = INS_rsb; const instruction INS_TEST = INS_tst; const instruction INS_MUL = INS_mul; +const instruction INS_MULADD = INS_mla; const instruction INS_SIGNED_DIVIDE = INS_sdiv; const instruction INS_UNSIGNED_DIVIDE = INS_udiv; const instruction INS_BREAKPOINT = INS_bkpt; @@ -9500,6 +9502,7 @@ const instruction INS_XOR = INS_eor; const instruction INS_NEG = INS_neg; const instruction INS_TEST = INS_tst; const instruction INS_MUL = INS_mul; +const instruction INS_MULADD = INS_madd; const instruction INS_SIGNED_DIVIDE = INS_sdiv; const instruction INS_UNSIGNED_DIVIDE = INS_udiv; const instruction INS_BREAKPOINT = INS_bkpt; |