rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix message formatting in runtime library.

Browse Source
This commit is contained in:
Graydon Hoare
2010-07-20 15:16:09 -07:00
parent 53f787e0b3
commit 9935a48e95
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rt/rust_dom.cpp
View File

@@ -339,7 +339,7 @@ rust_dom::start_main_loop()
I(this, scheduled_task->running()); I(this, scheduled_task->running());
log(rust_log::TASK, log(rust_log::TASK,
"activating task 0x%" PRIxPTR ", sp=x%" PRIxPTR, "activating task 0x%" PRIxPTR ", sp=0x%" PRIxPTR,
(uintptr_t)scheduled_task, scheduled_task->rust_sp); (uintptr_t)scheduled_task, scheduled_task->rust_sp);
interrupt_flag = 0; interrupt_flag = 0;

12
src/rt/rust_task.cpp
View File

@@ -280,9 +280,9 @@ rust_task::run_after_return(size_t nargs, uintptr_t glue)
uintptr_t *retpc = ((uintptr_t *) sp) - 1; uintptr_t *retpc = ((uintptr_t *) sp) - 1;
dom->log(rust_log::TASK|rust_log::MEM, dom->log(rust_log::TASK|rust_log::MEM,
"run_after_return: overwriting retpc=x%" PRIxPTR "run_after_return: overwriting retpc=0x%" PRIxPTR
" @ runtime_sp=x%" PRIxPTR " @ runtime_sp=0x%" PRIxPTR
" with glue=x%" PRIxPTR, " with glue=0x%" PRIxPTR,
*retpc, sp, glue); *retpc, sp, glue);
// Move the current return address (which points into rust code) // Move the current return address (which points into rust code)
@@ -301,9 +301,9 @@ rust_task::run_on_resume(uintptr_t glue)
uintptr_t* rsp = (uintptr_t*) rust_sp; uintptr_t* rsp = (uintptr_t*) rust_sp;
rsp += n_callee_saves; rsp += n_callee_saves;
dom->log(rust_log::TASK|rust_log::MEM, dom->log(rust_log::TASK|rust_log::MEM,
"run_on_resume: overwriting retpc=x%" PRIxPTR "run_on_resume: overwriting retpc=0x%" PRIxPTR
" @ rust_sp=x%" PRIxPTR " @ rust_sp=0x%" PRIxPTR
" with glue=x%" PRIxPTR, " with glue=0x%" PRIxPTR,
*rsp, rsp, glue); *rsp, rsp, glue);
*rsp = glue; *rsp = glue;
} }