diff options
| author | Brian Robbins <brianrob@microsoft.com> | 2018-04-04 14:44:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 14:44:58 -0700 |
| commit | dd4bd31ca1da68bafe64cbb0aa3aff65725f8237 (patch) | |
| tree | 5e53d3ec7a6b6630e4e2c8895bf4b7c37bf38410 /src/scripts | |
| parent | 9f4167504baa1ec693b14932868c6a8473d23180 (diff) | |
| download | coreclr-dd4bd31ca1da68bafe64cbb0aa3aff65725f8237.tar.gz coreclr-dd4bd31ca1da68bafe64cbb0aa3aff65725f8237.tar.bz2 coreclr-dd4bd31ca1da68bafe64cbb0aa3aff65725f8237.zip | |
Fix ARM32 on ARM64 Tracing (#17417)
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/genEventPipe.py | 2 | ||||
| -rw-r--r-- | src/scripts/genEventing.py | 4 | ||||
| -rw-r--r-- | src/scripts/genLttngProvider.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/scripts/genEventPipe.py b/src/scripts/genEventPipe.py index fc4570bf14..a8d891861a 100644 --- a/src/scripts/genEventPipe.py +++ b/src/scripts/genEventPipe.py @@ -437,7 +437,7 @@ bool WriteToBuffer(const T &value, char *&buffer, size_t& offset, size_t& size, return false; }} - *(T *)(buffer + offset) = value; + memcpy(buffer + offset, (char *)&value, sizeof(T)); offset += sizeof(T); return true; }} diff --git a/src/scripts/genEventing.py b/src/scripts/genEventing.py index 123ce81be4..8079bec262 100644 --- a/src/scripts/genEventing.py +++ b/src/scripts/genEventing.py @@ -285,7 +285,7 @@ def generateClrallEvents(eventNodes,allTemplates): clrallEvents.append(eventName) clrallEvents.append("() {return ") clrallEvents.append("EventPipeEventEnabled" + eventName + "() || ") - clrallEvents.append("EventXplatEnabled" + eventName + "();}\n\n") + clrallEvents.append("(XplatEventLogger::IsEventLoggingEnabled() && EventXplatEnabled" + eventName + "());}\n\n") #generate FireEtw functions fnptype = [] fnbody = [] @@ -815,4 +815,4 @@ def main(argv): if __name__ == '__main__': return_code = main(sys.argv[1:]) - sys.exit(return_code)
\ No newline at end of file + sys.exit(return_code) diff --git a/src/scripts/genLttngProvider.py b/src/scripts/genLttngProvider.py index 382cb74675..de537d0f1a 100644 --- a/src/scripts/genLttngProvider.py +++ b/src/scripts/genLttngProvider.py @@ -732,7 +732,7 @@ bool WriteToBuffer(const T &value, char *&buffer, size_t& offset, size_t& size, return false; } - *(T *)(buffer + offset) = value; + memcpy(buffer + offset, (char *)&value, sizeof(T)); offset += sizeof(T); return true; } |