summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nuttx/arch/arm/src/arm/up_releasepending.c16
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_releasepending.c16
-rw-r--r--nuttx/arch/avr/src/avr32/up_releasepending.c19
-rw-r--r--nuttx/arch/hc/src/common/up_releasepending.c16
-rw-r--r--nuttx/arch/mips/src/mips32/up_releasepending.c19
-rw-r--r--nuttx/arch/rgmp/src/nuttx.c8
-rw-r--r--nuttx/arch/sh/src/common/up_releasepending.c16
-rw-r--r--nuttx/arch/x86/src/common/up_releasepending.c16
-rw-r--r--nuttx/arch/z80/src/common/up_releasepending.c15
9 files changed, 125 insertions, 16 deletions
diff --git a/nuttx/arch/arm/src/arm/up_releasepending.c b/nuttx/arch/arm/src/arm/up_releasepending.c
index 2c58b735d..b7d1cd66d 100644
--- a/nuttx/arch/arm/src/arm/up_releasepending.c
+++ b/nuttx/arch/arm/src/arm/up_releasepending.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/arm/up_releasepending.c
*
- * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
#include <nuttx/arch.h>
#include "sched/sched.h"
+#include "group/group.h"
#include "up_internal.h"
/****************************************************************************
@@ -104,7 +105,9 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
- /* Then switch contexts */
+ /* Then switch contexts. Any necessary address environment
+ * changes will be made when the interrupt returns.
+ */
up_restorestate(rtcb->xcp.regs);
}
@@ -124,6 +127,15 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
+#ifdef CONFIG_ARCH_ADDRENV
+ /* Make sure that the address environment for the previously
+ * running task is closed down gracefully (data caches dump,
+ * MMU flushed) and set up the address environment for the new
+ * thread at the head of the ready-to-run list.
+ */
+
+ (void)group_addrenv(rtcb);
+#endif
/* Then switch contexts */
up_fullcontextrestore(rtcb->xcp.regs);
diff --git a/nuttx/arch/arm/src/armv7-a/arm_releasepending.c b/nuttx/arch/arm/src/armv7-a/arm_releasepending.c
index 45595b091..6a449f610 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_releasepending.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_releasepending.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/armv7-a/arm_releasepending.c
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
#include <nuttx/arch.h>
#include "sched/sched.h"
+#include "group/group.h"
#include "up_internal.h"
/****************************************************************************
@@ -104,7 +105,9 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
- /* Then switch contexts */
+ /* Then switch contexts. Any necessary address environment
+ * changes will be made when the interrupt returns.
+ */
up_restorestate(rtcb->xcp.regs);
}
@@ -124,6 +127,15 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
+#ifdef CONFIG_ARCH_ADDRENV
+ /* Make sure that the address environment for the previously
+ * running task is closed down gracefully (data caches dump,
+ * MMU flushed) and set up the address environment for the new
+ * thread at the head of the ready-to-run list.
+ */
+
+ (void)group_addrenv(rtcb);
+#endif
/* Then switch contexts */
up_fullcontextrestore(rtcb->xcp.regs);
diff --git a/nuttx/arch/avr/src/avr32/up_releasepending.c b/nuttx/arch/avr/src/avr32/up_releasepending.c
index 19f0e15ff..52edd7e94 100644
--- a/nuttx/arch/avr/src/avr32/up_releasepending.c
+++ b/nuttx/arch/avr/src/avr32/up_releasepending.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/avr/src/avr32/up_releasepending.c
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
#include <nuttx/arch.h>
#include "sched/sched.h"
+#include "group/group.h"
#include "up_internal.h"
/****************************************************************************
@@ -104,7 +105,9 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
- /* Then switch contexts */
+ /* Then switch contexts. Any necessary address environment
+ * changes will be made when the interrupt returns.
+ */
up_restorestate(rtcb->xcp.regs);
}
@@ -118,6 +121,18 @@ void up_release_pending(void)
*/
struct tcb_s *nexttcb = (struct tcb_s*)g_readytorun.head;
+
+#ifdef CONFIG_ARCH_ADDRENV
+ /* Make sure that the address environment for the previously
+ * running task is closed down gracefully (data caches dump,
+ * MMU flushed) and set up the address environment for the new
+ * thread at the head of the ready-to-run list.
+ */
+
+ (void)group_addrenv(nexttcb);
+#endif
+ /* Then switch contexs */
+
up_switchcontext(rtcb->xcp.regs, nexttcb->xcp.regs);
/* up_switchcontext forces a context switch to the task at the
diff --git a/nuttx/arch/hc/src/common/up_releasepending.c b/nuttx/arch/hc/src/common/up_releasepending.c
index 694dfcc1d..b71694af1 100644
--- a/nuttx/arch/hc/src/common/up_releasepending.c
+++ b/nuttx/arch/hc/src/common/up_releasepending.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/hc/src/common/up_releasepending.c
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
#include <nuttx/arch.h>
#include "sched/sched.h"
+#include "group/group.h"
#include "up_internal.h"
/****************************************************************************
@@ -103,7 +104,9 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
- /* Then switch contexts */
+ /* Then switch contexts. Any necessary address environment
+ * changes will be made when the interrupt returns.
+ */
up_restorestate(rtcb->xcp.regs);
}
@@ -123,6 +126,15 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
+#ifdef CONFIG_ARCH_ADDRENV
+ /* Make sure that the address environment for the previously
+ * running task is closed down gracefully (data caches dump,
+ * MMU flushed) and set up the address environment for the new
+ * thread at the head of the ready-to-run list.
+ */
+
+ (void)group_addrenv(rtcb);
+#endif
/* Then switch contexts */
up_fullcontextrestore(rtcb->xcp.regs);
diff --git a/nuttx/arch/mips/src/mips32/up_releasepending.c b/nuttx/arch/mips/src/mips32/up_releasepending.c
index 8823d3493..cbfe9dba3 100644
--- a/nuttx/arch/mips/src/mips32/up_releasepending.c
+++ b/nuttx/arch/mips/src/mips32/up_releasepending.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/mips/src/mips32/up_releasepending.c
*
- * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -46,6 +46,7 @@
#include <nuttx/arch.h>
#include "sched/sched.h"
+#include "group/group.h"
#include "up_internal.h"
/****************************************************************************
@@ -106,7 +107,9 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
- /* Then switch contexts */
+ /* Then switch contexts. Any necessary address environment
+ * changes will be made when the interrupt returns.
+ */
up_restorestate(rtcb->xcp.regs);
}
@@ -120,6 +123,18 @@ void up_release_pending(void)
*/
struct tcb_s *nexttcb = (struct tcb_s*)g_readytorun.head;
+
+#ifdef CONFIG_ARCH_ADDRENV
+ /* Make sure that the address environment for the previously
+ * running task is closed down gracefully (data caches dump,
+ * MMU flushed) and set up the address environment for the new
+ * thread at the head of the ready-to-run list.
+ */
+
+ (void)group_addrenv(nexttcb);
+#endif
+ /* Then switch contexts */
+
up_switchcontext(rtcb->xcp.regs, nexttcb->xcp.regs);
/* up_switchcontext forces a context switch to the task at the
diff --git a/nuttx/arch/rgmp/src/nuttx.c b/nuttx/arch/rgmp/src/nuttx.c
index ea0a4311f..4cc2a1a05 100644
--- a/nuttx/arch/rgmp/src/nuttx.c
+++ b/nuttx/arch/rgmp/src/nuttx.c
@@ -376,7 +376,15 @@ void up_release_pending(void)
if (sched_mergepending()) {
/* The currently active task has changed! */
struct tcb_s *nexttcb = (struct tcb_s*)g_readytorun.head;
+#ifdef CONFIG_ARCH_ADDRENV
+ /* Make sure that the address environment for the previously
+ * running task is closed down gracefully (data caches dump,
+ * MMU flushed) and set up the address environment for the new
+ * thread at the head of the ready-to-run list.
+ */
+ (void)group_addrenv(nexttcb);
+#endif
// context switch
up_switchcontext(rtcb, nexttcb);
}
diff --git a/nuttx/arch/sh/src/common/up_releasepending.c b/nuttx/arch/sh/src/common/up_releasepending.c
index b4685ded9..d76ca4a11 100644
--- a/nuttx/arch/sh/src/common/up_releasepending.c
+++ b/nuttx/arch/sh/src/common/up_releasepending.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/sh/src/common/up_releasepending.c
*
- * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
#include <nuttx/arch.h>
#include "sched/sched.h"
+#include "group/group.h"
#include "up_internal.h"
/****************************************************************************
@@ -104,7 +105,9 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
- /* Then switch contexts */
+ /* Then switch contexts. Any necessary address environment
+ * changes will be made when the interrupt returns.
+ */
current_regs = rtcb->xcp.regs;
}
@@ -124,6 +127,15 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
+#ifdef CONFIG_ARCH_ADDRENV
+ /* Make sure that the address environment for the previously
+ * running task is closed down gracefully (data caches dump,
+ * MMU flushed) and set up the address environment for the new
+ * thread at the head of the ready-to-run list.
+ */
+
+ (void)group_addrenv(rtcb);
+#endif
/* Then switch contexts */
up_fullcontextrestore(rtcb->xcp.regs);
diff --git a/nuttx/arch/x86/src/common/up_releasepending.c b/nuttx/arch/x86/src/common/up_releasepending.c
index 2f7db7618..0137243db 100644
--- a/nuttx/arch/x86/src/common/up_releasepending.c
+++ b/nuttx/arch/x86/src/common/up_releasepending.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/arm/up_releasepending.c
*
- * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
#include <nuttx/arch.h>
#include "sched/sched.h"
+#include "group/group.h"
#include "up_internal.h"
/****************************************************************************
@@ -104,7 +105,9 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
- /* Then switch contexts */
+ /* Then switch contexts. Any necessary address environment
+ * changes will be made when the interrupt returns.
+ */
up_restorestate(rtcb->xcp.regs);
}
@@ -124,6 +127,15 @@ void up_release_pending(void)
rtcb = (struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
+#ifdef CONFIG_ARCH_ADDRENV
+ /* Make sure that the address environment for the previously
+ * running task is closed down gracefully (data caches dump,
+ * MMU flushed) and set up the address environment for the new
+ * thread at the head of the ready-to-run list.
+ */
+
+ (void)group_addrenv(rtcb);
+#endif
/* Then switch contexts */
up_fullcontextrestore(rtcb->xcp.regs);
diff --git a/nuttx/arch/z80/src/common/up_releasepending.c b/nuttx/arch/z80/src/common/up_releasepending.c
index 6acc6f760..99771609e 100644
--- a/nuttx/arch/z80/src/common/up_releasepending.c
+++ b/nuttx/arch/z80/src/common/up_releasepending.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/z80/src/common/up_releasepending.c
*
- * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,7 @@
#include "chip/chip.h"
#include "chip/switch.h"
#include "sched/sched.h"
+#include "group/group.h"
#include "up_internal.h"
/****************************************************************************
@@ -108,7 +109,8 @@ void up_release_pending(void)
slldbg("New Active Task TCB=%p\n", rtcb);
/* Then setup so that the context will be performed on exit
- * from the interrupt.
+ * from the interrupt. Any necessary address environment
+ * changes will be made when the interrupt returns.
*/
SET_IRQCONTEXT(rtcb);
@@ -129,6 +131,15 @@ void up_release_pending(void)
rtcb = (FAR struct tcb_s*)g_readytorun.head;
slldbg("New Active Task TCB=%p\n", rtcb);
+#ifdef CONFIG_ARCH_ADDRENV
+ /* Make sure that the address environment for the previously
+ * running task is closed down gracefully (data caches dump,
+ * MMU flushed) and set up the address environment for the new
+ * thread at the head of the ready-to-run list.
+ */
+
+ (void)group_addrenv(rtcb);
+#endif
/* Then switch contexts */
RESTORE_USERCONTEXT(rtcb);
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 17:31:20 +0000