mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-08-19 17:48:33 -04:00
Revert Portable/oWatcom formatting (#829)
Revert the formatting on oWatcom ports
This commit is contained in:
Soren Ptak
GitHub
parent
0debe8c669
commit
bcf7bdaa13
6 changed files with 264 additions and 280 deletions
|
|
@ -45,65 +45,65 @@ void portSWITCH_CONTEXT( void );
|
|||
void portFIRST_CONTEXT( void );
|
||||
|
||||
/* There are slightly different versions depending on whether you are building
|
||||
* to include debugger information. If debugger information is used then there
|
||||
* are a couple of extra bytes left of the ISR stack (presumably for use by the
|
||||
* debugger). The true stack pointer is then stored in the bp register. We add
|
||||
* 2 to the stack pointer to remove the extra bytes before we restore our context. */
|
||||
to include debugger information. If debugger information is used then there
|
||||
are a couple of extra bytes left of the ISR stack (presumably for use by the
|
||||
debugger). The true stack pointer is then stored in the bp register. We add
|
||||
2 to the stack pointer to remove the extra bytes before we restore our context. */
|
||||
|
||||
#ifdef DEBUG_BUILD
|
||||
|
||||
#pragma aux portSWITCH_CONTEXT = "mov ax, seg pxCurrentTCB" \
|
||||
"mov ds, ax" \
|
||||
"les bx, pxCurrentTCB" /* Save the stack pointer into the TCB. */ \
|
||||
"mov es:0x2[ bx ], ss" \
|
||||
"mov es:[ bx ], sp" \
|
||||
"call vTaskSwitchContext" /* Perform the switch. */ \
|
||||
"mov ax, seg pxCurrentTCB" /* Restore the stack pointer from the TCB. */ \
|
||||
"mov ds, ax" \
|
||||
"les bx, dword ptr pxCurrentTCB" \
|
||||
"mov ss, es:[ bx + 2 ]" \
|
||||
"mov sp, es:[ bx ]" \
|
||||
"mov bp, sp" /* Prepair the bp register for the restoration of the SP in the compiler generated portion of the ISR */ \
|
||||
"add bp, 0x0002"
|
||||
#pragma aux portSWITCH_CONTEXT = "mov ax, seg pxCurrentTCB" \
|
||||
"mov ds, ax" \
|
||||
"les bx, pxCurrentTCB" /* Save the stack pointer into the TCB. */ \
|
||||
"mov es:0x2[ bx ], ss" \
|
||||
"mov es:[ bx ], sp" \
|
||||
"call vTaskSwitchContext" /* Perform the switch. */ \
|
||||
"mov ax, seg pxCurrentTCB" /* Restore the stack pointer from the TCB. */ \
|
||||
"mov ds, ax" \
|
||||
"les bx, dword ptr pxCurrentTCB" \
|
||||
"mov ss, es:[ bx + 2 ]" \
|
||||
"mov sp, es:[ bx ]" \
|
||||
"mov bp, sp" /* Prepair the bp register for the restoration of the SP in the compiler generated portion of the ISR */ \
|
||||
"add bp, 0x0002"
|
||||
|
||||
|
||||
|
||||
#pragma aux portFIRST_CONTEXT = "mov ax, seg pxCurrentTCB" \
|
||||
"mov ds, ax" \
|
||||
"les bx, dword ptr pxCurrentTCB" \
|
||||
"mov ss, es:[ bx + 2 ]" \
|
||||
"mov sp, es:[ bx ]" \
|
||||
"add sp, 0x0002" /* Remove the extra bytes that exist in debug builds before restoring the context. */ \
|
||||
"pop ax" \
|
||||
"pop ax" \
|
||||
"pop es" \
|
||||
"pop ds" \
|
||||
"popa" \
|
||||
"iret"
|
||||
#else /* ifdef DEBUG_BUILD */
|
||||
#pragma aux portFIRST_CONTEXT = "mov ax, seg pxCurrentTCB" \
|
||||
"mov ds, ax" \
|
||||
"les bx, dword ptr pxCurrentTCB" \
|
||||
"mov ss, es:[ bx + 2 ]" \
|
||||
"mov sp, es:[ bx ]" \
|
||||
"add sp, 0x0002" /* Remove the extra bytes that exist in debug builds before restoring the context. */ \
|
||||
"pop ax" \
|
||||
"pop ax" \
|
||||
"pop es" \
|
||||
"pop ds" \
|
||||
"popa" \
|
||||
"iret"
|
||||
#else
|
||||
|
||||
#pragma aux portSWITCH_CONTEXT = "mov ax, seg pxCurrentTCB" \
|
||||
"mov ds, ax" \
|
||||
"les bx, pxCurrentTCB" /* Save the stack pointer into the TCB. */ \
|
||||
"mov es:0x2[ bx ], ss" \
|
||||
"mov es:[ bx ], sp" \
|
||||
"call vTaskSwitchContext" /* Perform the switch. */ \
|
||||
"mov ax, seg pxCurrentTCB" /* Restore the stack pointer from the TCB. */ \
|
||||
"mov ds, ax" \
|
||||
"les bx, dword ptr pxCurrentTCB" \
|
||||
"mov ss, es:[ bx + 2 ]" \
|
||||
"mov sp, es:[ bx ]"
|
||||
#pragma aux portSWITCH_CONTEXT = "mov ax, seg pxCurrentTCB" \
|
||||
"mov ds, ax" \
|
||||
"les bx, pxCurrentTCB" /* Save the stack pointer into the TCB. */ \
|
||||
"mov es:0x2[ bx ], ss" \
|
||||
"mov es:[ bx ], sp" \
|
||||
"call vTaskSwitchContext" /* Perform the switch. */ \
|
||||
"mov ax, seg pxCurrentTCB" /* Restore the stack pointer from the TCB. */ \
|
||||
"mov ds, ax" \
|
||||
"les bx, dword ptr pxCurrentTCB" \
|
||||
"mov ss, es:[ bx + 2 ]" \
|
||||
"mov sp, es:[ bx ]"
|
||||
|
||||
|
||||
#pragma aux portFIRST_CONTEXT = "mov ax, seg pxCurrentTCB" \
|
||||
"mov ds, ax" \
|
||||
"les bx, dword ptr pxCurrentTCB" \
|
||||
"mov ss, es:[ bx + 2 ]" \
|
||||
"mov sp, es:[ bx ]" \
|
||||
"pop ax" \
|
||||
"pop ax" \
|
||||
"pop es" \
|
||||
"pop ds" \
|
||||
"popa" \
|
||||
"iret"
|
||||
#endif /* ifdef DEBUG_BUILD */
|
||||
#pragma aux portFIRST_CONTEXT = "mov ax, seg pxCurrentTCB" \
|
||||
"mov ds, ax" \
|
||||
"les bx, dword ptr pxCurrentTCB" \
|
||||
"mov ss, es:[ bx + 2 ]" \
|
||||
"mov sp, es:[ bx ]" \
|
||||
"pop ax" \
|
||||
"pop ax" \
|
||||
"pop es" \
|
||||
"pop ds" \
|
||||
"popa" \
|
||||
"iret"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -27,21 +27,21 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* Changes from V1.00:
|
||||
*
|
||||
+ pxPortInitialiseStack() now initialises the stack of new tasks to the
|
||||
+ same format used by the compiler. This allows the compiler generated
|
||||
+ interrupt mechanism to be used for context switches.
|
||||
+
|
||||
+ Changes from V2.4.2:
|
||||
+
|
||||
+ pvPortMalloc and vPortFree have been removed. The projects now use
|
||||
+ the definitions from the source/portable/MemMang directory.
|
||||
+
|
||||
+ Changes from V2.6.1:
|
||||
+
|
||||
+ usPortCheckFreeStackSpace() has been moved to tasks.c.
|
||||
*/
|
||||
Changes from V1.00:
|
||||
|
||||
+ pxPortInitialiseStack() now initialises the stack of new tasks to the
|
||||
same format used by the compiler. This allows the compiler generated
|
||||
interrupt mechanism to be used for context switches.
|
||||
|
||||
Changes from V2.4.2:
|
||||
|
||||
+ pvPortMalloc and vPortFree have been removed. The projects now use
|
||||
the definitions from the source/portable/MemMang directory.
|
||||
|
||||
Changes from V2.6.1:
|
||||
|
||||
+ usPortCheckFreeStackSpace() has been moved to tasks.c.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
|
@ -51,15 +51,13 @@
|
|||
/*-----------------------------------------------------------*/
|
||||
|
||||
/* See header file for description. */
|
||||
StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
|
||||
TaskFunction_t pxCode,
|
||||
void * pvParameters )
|
||||
StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )
|
||||
{
|
||||
StackType_t DS_Reg = 0;
|
||||
StackType_t * pxOriginalSP;
|
||||
StackType_t DS_Reg = 0;
|
||||
StackType_t * pxOriginalSP;
|
||||
|
||||
/* Place a few bytes of known values on the bottom of the stack.
|
||||
* This is just useful for debugging. */
|
||||
This is just useful for debugging. */
|
||||
|
||||
*pxTopOfStack = 0x1111;
|
||||
pxTopOfStack--;
|
||||
|
|
@ -76,9 +74,9 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
|
|||
/*lint -e950 -e611 -e923 Lint doesn't like this much - but nothing I can do about it. */
|
||||
|
||||
/* We are going to start the scheduler using a return from interrupt
|
||||
* instruction to load the program counter, so first there would be the
|
||||
* status register and interrupt return address. We make this the start
|
||||
* of the task. */
|
||||
instruction to load the program counter, so first there would be the
|
||||
status register and interrupt return address. We make this the start
|
||||
of the task. */
|
||||
*pxTopOfStack = portINITIAL_SW;
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = FP_SEG( pxCode );
|
||||
|
|
@ -87,24 +85,24 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
|
|||
pxTopOfStack--;
|
||||
|
||||
/* We are going to setup the stack for the new task to look like
|
||||
* the stack frame was setup by a compiler generated ISR. We need to know
|
||||
* the address of the existing stack top to place in the SP register within
|
||||
* the stack frame. pxOriginalSP holds SP before (simulated) pusha was
|
||||
* called. */
|
||||
the stack frame was setup by a compiler generated ISR. We need to know
|
||||
the address of the existing stack top to place in the SP register within
|
||||
the stack frame. pxOriginalSP holds SP before (simulated) pusha was
|
||||
called. */
|
||||
pxOriginalSP = pxTopOfStack;
|
||||
|
||||
/* The remaining registers would be pushed on the stack by our context
|
||||
* switch function. These are loaded with values simply to make debugging
|
||||
* easier. */
|
||||
*pxTopOfStack = FP_OFF( pvParameters ); /* AX */
|
||||
switch function. These are loaded with values simply to make debugging
|
||||
easier. */
|
||||
*pxTopOfStack = FP_OFF( pvParameters ); /* AX */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( StackType_t ) 0xCCCC; /* CX */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = FP_SEG( pvParameters ); /* DX */
|
||||
*pxTopOfStack = FP_SEG( pvParameters ); /* DX */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( StackType_t ) 0xBBBB; /* BX */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = FP_OFF( pxOriginalSP ); /* SP */
|
||||
*pxTopOfStack = FP_OFF( pxOriginalSP ); /* SP */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = ( StackType_t ) 0xBBBB; /* BP */
|
||||
pxTopOfStack--;
|
||||
|
|
@ -113,9 +111,7 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
|
|||
*pxTopOfStack = ( StackType_t ) 0xDDDD; /* DI */
|
||||
|
||||
/* We need the true data segment. */
|
||||
__asm {
|
||||
MOV DS_Reg, DS
|
||||
};
|
||||
__asm{ MOV DS_Reg, DS };
|
||||
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = DS_Reg; /* DS */
|
||||
|
|
@ -125,17 +121,16 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
|
|||
|
||||
/* The AX register is pushed again twice - don't know why. */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = FP_OFF( pvParameters ); /* AX */
|
||||
*pxTopOfStack = FP_OFF( pvParameters ); /* AX */
|
||||
pxTopOfStack--;
|
||||
*pxTopOfStack = FP_OFF( pvParameters ); /* AX */
|
||||
*pxTopOfStack = FP_OFF( pvParameters ); /* AX */
|
||||
|
||||
|
||||
#ifdef DEBUG_BUILD
|
||||
|
||||
/* The compiler adds space to each ISR stack if building to
|
||||
* include debug information. Presumably this is used by the
|
||||
* debugger - we don't need to initialise it to anything just
|
||||
* make sure it is there. */
|
||||
include debug information. Presumably this is used by the
|
||||
debugger - we don't need to initialise it to anything just
|
||||
make sure it is there. */
|
||||
pxTopOfStack--;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue