~aleteoryx/muditaos

muditaos/module-os/memory/usermem.c -rw-r--r-- 18.9 KiB
a405cad6Aleteoryx trim readme 6 days ago
                                                                                
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
/*
 *  @file usermem.c
 *  @author Mateusz Piesta (mateusz.piesta@mudita.com)
 *  @date 30 lip 2018
 *  @brief DYnamic memory allocator for user space
 *  @copyright Copyright (C) 2018 mudita.com
 *  @details
 */

#include <stddef.h>
#include <string.h>
#include <stdlib.h>
#include "macros.h"

/**
 * Sets heap size in SDRAM
 */
#ifndef PROJECT_CONFIG_USER_DYNMEM_SIZE
#error "Define user heap size!"
#else
#define USERMEM_TOTAL_HEAP_SIZE	PROJECT_CONFIG_USER_DYNMEM_SIZE
#endif

/* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
all the API functions to use the MPU wrappers.  That should only be done when
task.h is included from an application file. */
#define MPU_WRAPPERS_INCLUDED_FROM_API_FILE

#include "FreeRTOS.h"
#include "task.h"

#undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE

#if( configSUPPORT_DYNAMIC_ALLOCATION == 0 )
	#error This file must not be used if configSUPPORT_DYNAMIC_ALLOCATION is 0
#endif

/* Block sizes must not get too small. */
#define heapMINIMUM_BLOCK_SIZE	( ( size_t ) ( xHeapStructSize << 1 ) )

/* Assumes 8bit bytes! */
#define heapBITS_PER_BYTE		( ( size_t ) 8 )
/**
 * Document specified below is must to read. It explains cached memory regions alignment requirements
 * and so on.
 * https://www.avrfreaks.net/sites/default/files/forum_attachments/AN-15679_SAMS70_E70_Cache_Coherence.pdf
 */

#define usermemBYTE_ALIGNMENT		32
#define usermemBYTE_ALIGNMENT_MASK ( 0x001f )


#if( PROJECT_CONFIG_HEAP_INTEGRITY_CHECKS != 0 )
    #define INTEGRITY_STAMP_TAKEN   33333
    #define INTEGRITY_STAMP_FREE    11111
#endif


/* Allocate the memory for the heap. */
CACHEABLE_SECTION_SDRAM_ALIGN(static uint8_t userUcHeap[ USERMEM_TOTAL_HEAP_SIZE ],usermemBYTE_ALIGNMENT) ;


/* Define the linked list structure.  This is used to link free blocks in order
of their memory address. */
typedef struct A_BLOCK_LINK
{
#if( PROJECT_CONFIG_HEAP_INTEGRITY_CHECKS != 0 )
    uint32_t ulStamp;
#endif
	struct A_BLOCK_LINK *pxNextFreeBlock;	/*<< The next free block in the list. */
	size_t xBlockSize;						/*<< The size of the free block. */
#if (configUSER_HEAP_STATS == 1)
    TaskHandle_t xAllocatingTask; /*<< The task allocating the memory block. */
    TickType_t xTimeAllocated;    /*<< The timestamp of memory block allocation. */
#if (configUSER_HEAP_EXTENDED_STATS == 1)
	struct A_BLOCK_LINK *pxNextTakenBlock, *pxPrevTakenBlock;
#endif // configUSER_HEAP_EXTENDED_STATS
#endif // configUSER_HEAP_STATS
} BlockLink_t;

/*-----------------------------------------------------------*/

/*
 * Inserts a block of memory that is being freed into the correct position in
 * the list of free memory blocks.  The block being freed will be merged with
 * the block in front it and/or the block behind it if the memory blocks are
 * adjacent to each other.
 */
static void prvInsertBlockIntoFreeList( BlockLink_t *pxBlockToInsert );

/*
 * Called automatically to setup the required heap structures the first time
 * pvPortMalloc() is called.
 */
static void prvHeapInit( void );

/*-----------------------------------------------------------*/

/* The size of the structure placed at the beginning of each allocated memory
block must by correctly byte aligned. */
static const size_t xHeapStructSize = (sizeof(BlockLink_t)
        + ((size_t) ( usermemBYTE_ALIGNMENT - 1)))
        & ~((size_t) usermemBYTE_ALIGNMENT_MASK);

/* Create a couple of list links to mark the start and end of the list. */
static BlockLink_t xUserStart, *pxUserEnd = NULL;

/* Start/end of used blocks list */
#if (configUSER_HEAP_STATS == 1 && configUSER_HEAP_EXTENDED_STATS == 1)
static BlockLink_t xUserTakenEnd;
#endif

/* Keeps track of the number of free bytes remaining, but says nothing about
fragmentation. */
static size_t xUserFreeBytesRemaining = 0U;
static size_t xUserMinimumEverFreeBytesRemaining = 0U;

#if (configUSER_HEAP_STATS == 1 && configUSER_HEAP_EXTENDED_STATS == 1)
static size_t xUserNumberOfSuccessfulAllocations = 0U;
static size_t xUserNumberOfSuccessfulFrees = 0U;
#endif

/* Allocation statistics */
static size_t xAllocationsCount = 0;
static size_t xDeallocationsCount = 0;
static size_t xAllocatedMin = SIZE_MAX;
static size_t xAllocatedMax = 0;
static size_t xAllocatedSum = 0;

/* Gets set to the top bit of an size_t type.  When this bit in the xBlockSize
member of an BlockLink_t structure is set then the block belongs to the
application.  When the bit is free the block is still part of the free heap
space. */
static size_t xBlockAllocatedBit = 0;

void *usermalloc(size_t xWantedSize)
{
	BlockLink_t *pxBlock, *pxPreviousBlock, *pxNewBlockLink;
	void *pvReturn = NULL;

    // Preventing use of an allocator in an interrupt
    if (isIRQ()) {
        abort();
    }

		vTaskSuspendAll();
		{
			/* If this is the first call to malloc then the heap will require
			initialisation to setup the list of free blocks. */
			if( pxUserEnd == NULL )
			{
				prvHeapInit();
			}
			else
			{
				mtCOVERAGE_TEST_MARKER();
			}

			/* Check the requested block size is not so large that the top bit is
			set.  The top bit of the block size member of the BlockLink_t structure
			is used to determine who owns the block - the application or the
			kernel, so it must be free. */
			if( ( xWantedSize & xBlockAllocatedBit ) == 0 )
			{
				/* The wanted size is increased so it can contain a BlockLink_t
				structure in addition to the requested amount of bytes. */
				if( xWantedSize > 0 )
				{
					xWantedSize += xHeapStructSize;

					/* Ensure that blocks are always aligned to the required number
					of bytes. */
					if( ( xWantedSize & usermemBYTE_ALIGNMENT_MASK ) != 0x00 )
					{
						/* Byte alignment required. */
						xWantedSize += ( usermemBYTE_ALIGNMENT - ( xWantedSize & usermemBYTE_ALIGNMENT_MASK ) );
						configASSERT( ( xWantedSize & usermemBYTE_ALIGNMENT_MASK ) == 0 );
					}
					else
					{
						mtCOVERAGE_TEST_MARKER();
					}
				}
				else
				{
					mtCOVERAGE_TEST_MARKER();
				}

				if( ( xWantedSize > 0 ) && ( xWantedSize <= xUserFreeBytesRemaining ) )
				{
					/* Traverse the list from the start	(lowest address) block until
					one	of adequate size is found. */
					pxPreviousBlock = &xUserStart;
					pxBlock = xUserStart.pxNextFreeBlock;
					while( ( pxBlock->xBlockSize < xWantedSize ) && ( pxBlock->pxNextFreeBlock != NULL ) )
					{
						pxPreviousBlock = pxBlock;
						pxBlock = pxBlock->pxNextFreeBlock;
					}

					/* If the end marker was reached then a block of adequate size
					was	not found. */
					if( pxBlock != pxUserEnd )
					{
						/* Return the memory space pointed to - jumping over the
						BlockLink_t structure at its start. */
						pvReturn = ( void * ) ( ( ( uint8_t * ) pxPreviousBlock->pxNextFreeBlock ) + xHeapStructSize );

						/* This block is being returned for use so must be taken out
						of the list of free blocks. */
						pxPreviousBlock->pxNextFreeBlock = pxBlock->pxNextFreeBlock;

						/* If the block is larger than required it can be split into
						two. */
						if( ( pxBlock->xBlockSize - xWantedSize ) > heapMINIMUM_BLOCK_SIZE )
						{
							/* This block is to be split into two.  Create a new
							block following the number of bytes requested. The void
							cast is used to prevent byte alignment warnings from the
							compiler. */
							pxNewBlockLink = ( void * ) ( ( ( uint8_t * ) pxBlock ) + xWantedSize );
							configASSERT( ( ( ( size_t ) pxNewBlockLink ) & usermemBYTE_ALIGNMENT_MASK ) == 0 );

							/* Calculate the sizes of two blocks split from the
							single block. */
							pxNewBlockLink->xBlockSize = pxBlock->xBlockSize - xWantedSize;

							#if( PROJECT_CONFIG_HEAP_INTEGRITY_CHECKS != 0 )
							{
                            	pxNewBlockLink->ulStamp = INTEGRITY_STAMP_FREE;
							}
							#endif

							pxBlock->xBlockSize = xWantedSize;

							/* Insert the new block into the list of free blocks. */
							prvInsertBlockIntoFreeList( pxNewBlockLink );
						}
						else
						{
							mtCOVERAGE_TEST_MARKER();
						}

						/* Allocation statistics */
#if DEBUG_HEAP_ALLOCATIONS == 1
						++xAllocationsCount;
						if (pxBlock->xBlockSize < xAllocatedMin) xAllocatedMin = pxBlock->xBlockSize;
						if (pxBlock->xBlockSize > xAllocatedMax) xAllocatedMax = pxBlock->xBlockSize;
						xAllocatedSum += pxBlock->xBlockSize;
#endif

						xUserFreeBytesRemaining -= pxBlock->xBlockSize;

						if( xUserFreeBytesRemaining < xUserMinimumEverFreeBytesRemaining )
						{
							xUserMinimumEverFreeBytesRemaining = xUserFreeBytesRemaining;
						}
						else
						{
							mtCOVERAGE_TEST_MARKER();
						}

						/* The block is being returned - it is allocated and owned
						by the application and has no "next" block. */
						pxBlock->xBlockSize |= xBlockAllocatedBit;
#if (configUSER_HEAP_STATS == 1)
#if (configUSER_HEAP_EXTENDED_STATS == 1)
                        /* Push taken block at the end of the taken list */
                        xUserTakenEnd.pxPrevTakenBlock->pxNextTakenBlock = pxBlock;
                        pxBlock->pxPrevTakenBlock                   	 = xUserTakenEnd.pxPrevTakenBlock;
                        pxBlock->pxNextTakenBlock                    	 = &xUserTakenEnd;
                        xUserTakenEnd.pxPrevTakenBlock                   = pxBlock;
#endif // configUSER_HEAP_EXTENDED_STATS
                        pxBlock->xAllocatingTask = xTaskGetCurrentTaskHandle();
                        pxBlock->xTimeAllocated  = xTaskGetTickCount();
#endif // configUSER_HEAP_STATS

#if (PROJECT_CONFIG_HEAP_INTEGRITY_CHECKS != 0)
                    	{
							/* First check if the block was still marked as 'free' */
							configASSERT( pxBlock->ulStamp == INTEGRITY_STAMP_FREE );
							/* And now mark it as 'taken' */
							pxBlock->ulStamp = INTEGRITY_STAMP_TAKEN;
                    	}
                    	#endif

						pxBlock->pxNextFreeBlock = NULL;
#if (configUSER_HEAP_STATS == 1 && configUSER_HEAP_EXTENDED_STATS == 1)
						xUserNumberOfSuccessfulAllocations++;
#endif						
					}
					else
					{
						mtCOVERAGE_TEST_MARKER();
					}
				}
				else
				{
					mtCOVERAGE_TEST_MARKER();
				}
			}
			else
			{
				mtCOVERAGE_TEST_MARKER();
			}

			traceMALLOC( pvReturn, xWantedSize );
		}
		( void ) xTaskResumeAll();

		#if( configUSE_MALLOC_FAILED_HOOK == 1 )
		{
			if( pvReturn == NULL )
			{
				extern void vApplicationMallocFailedHook( void );
				vApplicationMallocFailedHook();
			}
			else
			{
				mtCOVERAGE_TEST_MARKER();
			}
		}
		#endif

		configASSERT( ( ( ( size_t ) pvReturn ) & ( size_t ) usermemBYTE_ALIGNMENT_MASK ) == 0 );
		return pvReturn;
}

void userfree(void *pv)
{
	uint8_t *puc = ( uint8_t * ) pv;
	BlockLink_t *pxLink;

    // Preventing use of an allocator in an interrupt
    if (isIRQ()) {
        abort();
    }

		if( pv != NULL )
		{
			/* The memory being freed will have an BlockLink_t structure immediately
			before it. */
			puc -= xHeapStructSize;

			/* This casting is to keep the compiler from issuing warnings. */
			pxLink = ( void * ) puc;

			/* Check the block is actually allocated. */
			configASSERT( ( pxLink->xBlockSize & xBlockAllocatedBit ) != 0 );
			configASSERT( pxLink->pxNextFreeBlock == NULL );

			#if( PROJECT_CONFIG_HEAP_INTEGRITY_CHECKS != 0 )
        	{
            	configASSERT( pxLink->ulStamp == INTEGRITY_STAMP_TAKEN );
            	pxLink->ulStamp = INTEGRITY_STAMP_FREE;
        	}
        	#endif

			if( ( pxLink->xBlockSize & xBlockAllocatedBit ) != 0 )
			{
				if( pxLink->pxNextFreeBlock == NULL )
				{
					/* The block is being returned to the heap - it is no longer
					allocated. */
					pxLink->xBlockSize &= ~xBlockAllocatedBit;

					vTaskSuspendAll();
					{
						/* Allocation statistics */
#if DEBUG_HEAP_ALLOCATIONS == 1
						++xDeallocationsCount;
						xAllocatedSum -= pxLink->xBlockSize;
#endif

						/* Add this block to the list of free blocks. */
						xUserFreeBytesRemaining += pxLink->xBlockSize;
						traceFREE( pv, pxLink->xBlockSize );
						prvInsertBlockIntoFreeList( ( ( BlockLink_t * ) pxLink ) );
#if (configUSER_HEAP_STATS == 1 && configUSER_HEAP_EXTENDED_STATS == 1)
						xUserNumberOfSuccessfulFrees++;
                        /* Update taken list */
                        pxLink->pxPrevTakenBlock->pxNextTakenBlock = pxLink->pxNextTakenBlock;
                        pxLink->pxNextTakenBlock->pxPrevTakenBlock = pxLink->pxPrevTakenBlock;
                        pxLink->pxPrevTakenBlock                   = NULL;
                        pxLink->pxNextTakenBlock                   = NULL;
#endif						
					}
					( void ) xTaskResumeAll();
				}
				else
				{
					mtCOVERAGE_TEST_MARKER();
				}
			}
			else
			{
				mtCOVERAGE_TEST_MARKER();
			}
		}
}

void *userrealloc(void *pv, size_t xWantedSize) {
    uint8_t *puc = ( uint8_t * ) pv;
    BlockLink_t *pxLink;
    size_t curSize = 0;
    void *new = NULL;

    if( pv != NULL ) {
        /* The memory being freed will have an BlockLink_t structure immediately
                    before it. */
        puc -= xHeapStructSize;

        /* This casting is to keep the compiler from issuing warnings. */
        pxLink = ( void * ) puc;

        /* Check the block is actually allocated. */
        configASSERT( ( pxLink->xBlockSize & xBlockAllocatedBit ) != 0 );
        configASSERT( pxLink->pxNextFreeBlock == NULL );

        if( ( pxLink->xBlockSize & xBlockAllocatedBit ) != 0 ) {
            curSize = pxLink->xBlockSize & ~xBlockAllocatedBit;

            if (curSize >= xWantedSize)
                return pv;

            new = usermalloc(xWantedSize);
            if (!new) return NULL;
            vTaskSuspendAll();
            memcpy(new, pv, curSize);
            ( void ) xTaskResumeAll();
            userfree(pv);

            return new;
        }
        else
        {
        	mtCOVERAGE_TEST_MARKER();
        }
        return NULL;
    }
    else {
        return usermalloc(xWantedSize);
    }
    return NULL;
}

/*-----------------------------------------------------------*/

size_t usermemGetFreeHeapSize( void )
{
    return xUserFreeBytesRemaining;
}
/*-----------------------------------------------------------*/

size_t usermemGetMinimumEverFreeHeapSize( void )
{
    return xUserMinimumEverFreeBytesRemaining;
}
/*-----------------------------------------------------------*/

void usermemResetStatistics(void)
{
	xAllocationsCount = 0;
	xDeallocationsCount = 0;
	xAllocatedMin = SIZE_MAX;
	xAllocatedMax = 0;
	xAllocatedSum = 0;
}
size_t usermemGetAllocationsCount(void)
{
	return xAllocationsCount;
}
size_t usermemGetDeallocationsCount(void)
{
	return xDeallocationsCount;
}
size_t usermemGetAllocatedMin(void)
{
	return xAllocatedMin;
}
size_t usermemGetAllocatedMax(void)
{
	return xAllocatedMax;
}
size_t usermemGetAllocatedSum(void)
{
	return xAllocatedSum;
}

/*-----------------------------------------------------------*/

static void prvHeapInit( void )
{
BlockLink_t *pxFirstFreeBlock;
uint8_t *pucAlignedHeap;
size_t uxAddress;

size_t xTotalHeapSize = USERMEM_TOTAL_HEAP_SIZE;

	/* Ensure the heap starts on a correctly aligned boundary. */
	uxAddress = ( size_t ) userUcHeap;

	if( ( uxAddress & usermemBYTE_ALIGNMENT_MASK ) != 0 )
	{
		uxAddress += ( usermemBYTE_ALIGNMENT - 1 );
		uxAddress &= ~( ( size_t ) usermemBYTE_ALIGNMENT_MASK );
		xTotalHeapSize -= uxAddress - ( size_t ) userUcHeap;
	}

	pucAlignedHeap = ( uint8_t * ) uxAddress;

	/* xUserStart is used to hold a pointer to the first item in the list of free
	blocks.  The void cast is used to prevent compiler warnings. */
	xUserStart.pxNextFreeBlock = ( void * ) pucAlignedHeap;
	xUserStart.xBlockSize = ( size_t ) 0;
#if (configUSER_HEAP_STATS == 1)
    xUserStart.xTimeAllocated  = 0;
    xUserStart.xAllocatingTask = 0;

#if (configUSER_HEAP_EXTENDED_STATS == 1)
    xUserStart.pxNextTakenBlock = &xUserTakenEnd;
    xUserStart.pxPrevTakenBlock = NULL;

	xUserTakenEnd.pxNextFreeBlock  = NULL;
    xUserTakenEnd.xBlockSize	   = 0;
    xUserTakenEnd.pxNextTakenBlock = NULL;
    xUserTakenEnd.pxPrevTakenBlock = &xUserStart;
    xUserTakenEnd.xTimeAllocated   = 0;
    xUserTakenEnd.xAllocatingTask  = 0;
#endif // configUSER_HEAP_EXTENDED_STATS
#endif // configUSER_HEAP_STATS

    /* pxUserEnd is used to mark the end of the list of free blocks and is inserted
	at the end of the heap space. */
	uxAddress = ( ( size_t ) pucAlignedHeap ) + xTotalHeapSize;
	uxAddress -= xHeapStructSize;
	uxAddress &= ~( ( size_t ) usermemBYTE_ALIGNMENT_MASK );
	pxUserEnd = ( void * ) uxAddress;
	pxUserEnd->xBlockSize = 0;
	pxUserEnd->pxNextFreeBlock = NULL;
#if (configUSER_HEAP_STATS == 1)
    pxUserEnd->xTimeAllocated  = 0;
    pxUserEnd->xAllocatingTask = 0;
#endif

    /* To start with there is a single free block that is sized to take up the
	entire heap space, minus the space taken by pxUserEnd. */
	pxFirstFreeBlock = ( void * ) pucAlignedHeap;
	pxFirstFreeBlock->xBlockSize = uxAddress - ( size_t ) pxFirstFreeBlock;
	pxFirstFreeBlock->pxNextFreeBlock = pxUserEnd;
	#if( PROJECT_CONFIG_HEAP_INTEGRITY_CHECKS != 0 )
    {
        pxFirstFreeBlock->ulStamp = INTEGRITY_STAMP_FREE;
    }
    #endif

	/* Only one block exists - and it covers the entire usable heap space. */
	xUserMinimumEverFreeBytesRemaining = pxFirstFreeBlock->xBlockSize;
	xUserFreeBytesRemaining = pxFirstFreeBlock->xBlockSize;

	/* Work out the position of the top bit in a size_t variable. */
	xBlockAllocatedBit = ( ( size_t ) 1 ) << ( ( sizeof( size_t ) * heapBITS_PER_BYTE ) - 1 );
}
/*-----------------------------------------------------------*/

static void prvInsertBlockIntoFreeList( BlockLink_t *pxBlockToInsert )
{
BlockLink_t *pxIterator;
uint8_t *puc;

	/* Iterate through the list until a block is found that has a higher address
	than the block being inserted. */
	for( pxIterator = &xUserStart; pxIterator->pxNextFreeBlock < pxBlockToInsert; pxIterator = pxIterator->pxNextFreeBlock )
	{
		/* Nothing to do here, just iterate to the right position. */
	}

	/* Do the block being inserted, and the block it is being inserted after
	make a contiguous block of memory? */
	puc = ( uint8_t * ) pxIterator;
	if( ( puc + pxIterator->xBlockSize ) == ( uint8_t * ) pxBlockToInsert )
	{
		pxIterator->xBlockSize += pxBlockToInsert->xBlockSize;
		pxBlockToInsert = pxIterator;
	}
	else
	{
		mtCOVERAGE_TEST_MARKER();
	}

	/* Do the block being inserted, and the block it is being inserted before
	make a contiguous block of memory? */
	puc = ( uint8_t * ) pxBlockToInsert;
	if( ( puc + pxBlockToInsert->xBlockSize ) == ( uint8_t * ) pxIterator->pxNextFreeBlock )
	{
		if( pxIterator->pxNextFreeBlock != pxUserEnd )
		{
			/* Form one big block from the two blocks. */
			pxBlockToInsert->xBlockSize += pxIterator->pxNextFreeBlock->xBlockSize;
			pxBlockToInsert->pxNextFreeBlock = pxIterator->pxNextFreeBlock->pxNextFreeBlock;
		}
		else
		{
			pxBlockToInsert->pxNextFreeBlock = pxUserEnd;
		}
	}
	else
	{
		pxBlockToInsert->pxNextFreeBlock = pxIterator->pxNextFreeBlock;
	}

	/* If the block being inserted plugged a gab, so was merged with the block
	before and the block after, then it's pxNextFreeBlock pointer will have
	already been set, and should not be set here as that would make it point
	to itself. */
	if( pxIterator != pxBlockToInsert )
	{
		pxIterator->pxNextFreeBlock = pxBlockToInsert;
	}
	else
	{
		mtCOVERAGE_TEST_MARKER();
	}
}