diff options
| author | Eric Holk <eholk@mozilla.com> | 2011-08-05 15:17:18 -0700 |
|---|---|---|
| committer | Eric Holk <eholk@mozilla.com> | 2011-08-05 15:17:18 -0700 |
| commit | d65aaa933a205a694e5387d40fbea4c10cb168a8 (patch) | |
| tree | 7d2a6fc15854de40db5a939327bce8b4985a4c42 /src/rt/rust_upcall.cpp | |
| parent | bdb84e76c5798731eee3261e2c6169064a022043 (diff) | |
| parent | e76efbc43a39ad035a29d6e1abc2a86b16123a03 (diff) | |
| download | rust-d65aaa933a205a694e5387d40fbea4c10cb168a8.tar.gz rust-d65aaa933a205a694e5387d40fbea4c10cb168a8.zip | |
Merge branch 'master' of github.com:graydon/rust
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 2554868c986..02fa7bc2846 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -1,21 +1,8 @@ #include "rust_internal.h" +#include "rust_upcall.h" // Upcalls. -#ifdef __GNUC__ -#define LOG_UPCALL_ENTRY(task) \ - LOG(task, upcall, \ - "> UPCALL %s - task: %s 0x%" PRIxPTR \ - " retpc: x%" PRIxPTR, \ - __FUNCTION__, \ - (task)->name, (task), \ - __builtin_return_address(0)); -#else -#define LOG_UPCALL_ENTRY(task) \ - LOG(task, upcall, "> UPCALL task: %s @x%" PRIxPTR, \ - (task)->name, (task)); -#endif - extern "C" CDECL char const * str_buf(rust_task *task, rust_str *s); |