diff --git a/target-mips/TODO b/target-mips/TODO
index c58956cff64f7f2d90ba6272efce69f168374108..6722c20d7aa3179d0f9d735f07d3e9be6801bc13 100644
--- a/target-mips/TODO
+++ b/target-mips/TODO
@@ -30,6 +30,11 @@ General
   each ASID change. Using the MMU modes to implement ASIDs hinges on
   implementing the global bit efficiently.
 - save/restore of the CPU state is not implemented (see machine.c).
+- Improve cpu state handling:
+  Step 1) Collect all the TC state in a single struct, so we need only
+          a single global pointer per TC.
+  Step 2) Use only a single TC context as working context, and copy the
+          contexts on TC switch. Likewise for FPU contexts.
 
 MIPS64
 ------