From eb39c103a6f82eeb2ae15b465355f4123355c33f Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Fri, 11 Jan 2013 17:27:42 +0100 Subject: [PATCH] Ex_regs: Change 'user_flags' Return true if thread is ready. Was: 'foc_exregs_ret_state.patch' --- kernel/fiasco/src/kern/arm/thread-arm.cpp | 2 +- kernel/fiasco/src/kern/ia32/thread-ia32.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/fiasco/src/kern/arm/thread-arm.cpp b/kernel/fiasco/src/kern/arm/thread-arm.cpp index f62d7b49..01895e41 100644 --- a/kernel/fiasco/src/kern/arm/thread-arm.cpp +++ b/kernel/fiasco/src/kern/arm/thread-arm.cpp @@ -419,7 +419,7 @@ Thread::user_ip() const IMPLEMENT inline Mword Thread::user_flags() const -{ return 0; } +{ return state() & Thread_ready; } IMPLEMENT inline NEEDS[Thread::exception_triggered] void diff --git a/kernel/fiasco/src/kern/ia32/thread-ia32.cpp b/kernel/fiasco/src/kern/ia32/thread-ia32.cpp index 079f9999..3594b7d0 100644 --- a/kernel/fiasco/src/kern/ia32/thread-ia32.cpp +++ b/kernel/fiasco/src/kern/ia32/thread-ia32.cpp @@ -92,7 +92,10 @@ Thread::user_ip() const IMPLEMENT inline Mword Thread::user_flags() const -{ return regs()->flags(); } +{ + // pass thread-ready state in carry flag (Thread_ready is bit 0) + return (regs()->flags() & ~Thread_ready) | (state() & Thread_ready); +} /** Check if the pagefault occured at a special place: At some places in the kernel we want to ensure that a specific address is mapped. The regular