---

yaml
---
r: 329
b: refs/heads/master
c: 9935a48
h: refs/heads/master
i:
  327: 9b2bb7e
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53f787e0b3ebe95f8b771d219eb4370f8871c4e8
+refs/heads/master: 9935a48e95e1a56b64f08e42abfae496f2906705

trunk/src/rt/rust_dom.cpp

@@ -339,7 +339,7 @@ rust_dom::start_main_loop()
         I(this, scheduled_task->running());
 
         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);
 
         interrupt_flag = 0;

trunk/src/rt/rust_task.cpp

@@ -280,9 +280,9 @@ rust_task::run_after_return(size_t nargs, uintptr_t glue)
 
     uintptr_t *retpc = ((uintptr_t *) sp) - 1;
     dom->log(rust_log::TASK|rust_log::MEM,
-             "run_after_return: overwriting retpc=x%" PRIxPTR
-             " @ runtime_sp=x%" PRIxPTR
-             " with glue=x%" PRIxPTR,
+             "run_after_return: overwriting retpc=0x%" PRIxPTR
+             " @ runtime_sp=0x%" PRIxPTR
+             " with glue=0x%" PRIxPTR,
              *retpc, sp, glue);
 
     // 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;
     rsp += n_callee_saves;
     dom->log(rust_log::TASK|rust_log::MEM,
-             "run_on_resume: overwriting retpc=x%" PRIxPTR
-             " @ rust_sp=x%" PRIxPTR
-             " with glue=x%" PRIxPTR,
+             "run_on_resume: overwriting retpc=0x%" PRIxPTR
+             " @ rust_sp=0x%" PRIxPTR
+             " with glue=0x%" PRIxPTR,
              *rsp, rsp, glue);
     *rsp = glue;
 }