Skip to content

Commit 04d65d7

Browse files
author
Jason Kridner
committed
WIP: working on the next release
1 parent e363612 commit 04d65d7

19 files changed

+513
-50
lines changed

‎Documentation/01-AM335x_PRU_ICSS_Overview.pdf

365 KB
Binary file not shown.

‎Documentation/02-AM18x_PRUSS_to_AM335x_PRU-ICSS_Software_Migration_Guide.pdf

142 KB
Binary file not shown.

‎am335xPruPackage_1_1_Manifest.pdf

-85.5 KB
Binary file not shown.

‎am335xPruReferenceGuide.pdf

-2.63 MB
Binary file not shown.

‎pru_sw/example_apps/Makefile

100755100644
+26-27
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1-
-include DIRS
2-
3-
CROSS_COMPILE?=arm-arago-linux-gnueabi-
4-
LIBDIR_APP_LOADER?=../../app_loader/lib
5-
INCDIR_APP_LOADER?=../../app_loader/include
6-
BINDIR_APPLICATIONS?=../bin
7-
BINDIR_FW?=bin
8-
PASM?=../utils/pasm
9-
10-
all:
11-
# Make PRU example applications
12-
mkdir -p bin
13-
14-
for dir in $(APP_DIRS); do make -C $$dir CROSS_COMPILE="${CROSS_COMPILE}" LIBDIR_APP_LOADER="${LIBDIR_APP_LOADER}" LIBDIR_EDMA_DRIVER="${LIBDIR_EDMA_DRIVER}" INCDIR_APP_LOADER="${INCDIR_APP_LOADER}" INCDIR_EDMA_DRIVER="${INCDIR_EDMA_DRIVER}" BINDIR="${BINDIR_APPLICATIONS}"; done
15-
16-
# Pass PRU assembly code for each example through assembler
17-
for a_file in ${ASSEM_FILES} ; \
18-
do \
19-
${PASM} -b $$a_file ; \
20-
done ; \
21-
mv *.bin ${BINDIR_FW}
22-
23-
clean:
24-
for dir in $(APP_DIRS); do make -C $$dir clean LIBDIR_APP_LOADER="${LIBDIR_APP_LOADER}" LIBDIR_EDMA_DRIVER="${LIBDIR_EDMA_DRIVER}" INCDIR_APP_LOADER="${INCDIR_APP_LOADER}" INCDIR_EDMA_DRIVER="${INCDIR_EDMA_DRIVER}" BINDIR="${BINDIR_APPLICATIONS}"; done
25-
26-
for bin_file in ${BIN_FILES}; do rm -fr ${BINDIR_FW}/$$bin_file; done
27-
1+
-include DIRS
2+
3+
CROSS_COMPILE?=arm-arago-linux-gnueabi-
4+
LIBDIR_APP_LOADER?=../../app_loader/lib
5+
INCDIR_APP_LOADER?=../../app_loader/include
6+
BINDIR_APPLICATIONS?=../bin
7+
BINDIR_FW?=bin
8+
PASM?=../utils/pasm_2
9+
10+
all:
11+
# Make PRU example applications
12+
mkdir -p bin
13+
14+
for dir in $(APP_DIRS); do make -C $$dir CROSS_COMPILE="${CROSS_COMPILE}" LIBDIR_APP_LOADER="${LIBDIR_APP_LOADER}" LIBDIR_EDMA_DRIVER="${LIBDIR_EDMA_DRIVER}" INCDIR_APP_LOADER="${INCDIR_APP_LOADER}" INCDIR_EDMA_DRIVER="${INCDIR_EDMA_DRIVER}" BINDIR="${BINDIR_APPLICATIONS}"; done
15+
16+
# Pass PRU assembly code for each example through assembler
17+
for a_file in ${ASSEM_FILES} ; \
18+
do \
19+
${PASM} -V3 -b $$a_file ; \
20+
done ; \
21+
mv *.bin ${BINDIR_FW}
22+
23+
clean:
24+
for dir in $(APP_DIRS); do make -C $$dir clean LIBDIR_APP_LOADER="${LIBDIR_APP_LOADER}" LIBDIR_EDMA_DRIVER="${LIBDIR_EDMA_DRIVER}" INCDIR_APP_LOADER="${INCDIR_APP_LOADER}" INCDIR_EDMA_DRIVER="${INCDIR_EDMA_DRIVER}" BINDIR="${BINDIR_APPLICATIONS}"; done
25+
26+
for bin_file in ${BIN_FILES}; do rm -fr ${BINDIR_FW}/$$bin_file; done

‎pru_sw/utils/pasm

-68.7 KB
Binary file not shown.

‎pru_sw/utils/pasm_2

80.1 KB
Binary file not shown.

‎pru_sw/utils/pasm_source/dosbuild.bat

100644100755
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
cl -W3 -D_CRT_SECURE_NO_WARNINGS pasm.c pasmpp.c pasmexp.c pasmop.c pasmdot.c pasmstruct.c pasmmacro.c /Febin\pasm.exe
1+
cl -W3 -D_CRT_SECURE_NO_WARNINGS pasm.c pasmpp.c pasmexp.c pasmop.c pasmdot.c pasmstruct.c pasmmacro.c /Fe..\pasm.exe
22
del *.obj
33

4-

‎pru_sw/utils/pasm_source/pasm.c

100644100755
+64-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
//
5959
//---------------------------------------------------------------------------
6060
// Revision:
61-
// 15-Jun-12: 0.80 - Open source version
61+
// 21-Jun-13: 0.84 - Open source version
6262
============================================================================*/
6363

6464
#include <stdio.h>
@@ -73,11 +73,33 @@
7373
#include "pasm.h"
7474
#include "pasmdbg.h"
7575

76+
/*
77+
// Multiple Core Revision Support
78+
// ------------------------------
79+
//
80+
// -V0 PRU Legacy (same as -x)
81+
// -V1 PRU Generation 1 (default)
82+
// Adds [LMBD,SCAN,HALT,ZERO(1),MVI(1),SLP(1)] Removes [LFC,STC]
83+
// -V2 PRU Generation 2 (same as -X)
84+
// Adds [ZERO(2),FILL,XIN,XOUT,XCHG,MVI(2)] Removes [SCAN]
85+
// -V3 PRU Generation 3
86+
// Adds [SLP(2),LOOP,ILOOP,SXIN,SXOUT,SXCHG,NOPx]
87+
//
88+
// ZERO(1) : Zero is multi-cycle pseudo op encoded via moves
89+
// ZERO(2) : Zero is single-cycle pseudo op encoded via XFR
90+
//
91+
// MVI(1) : Pseudo op forms of MVI only
92+
// MVI(2) : Pseudo op forms of MVI only
93+
//
94+
// SLP(1) : SLP with trailing NOP
95+
// SLP(2) : SLP without trailing NOP
96+
*/
97+
7698

7799
/* ---------- Local Macro Definitions ----------- */
78100

79101
#define PROCESSOR_NAME_STRING ("PRU")
80-
#define VERSION_STRING ("0.80")
102+
#define VERSION_STRING ("0.84")
81103

82104
#define MAXFILE (256) /* Max file length for output files */
83105
#define MAX_PROGRAM (16384) /* Max instruction count */
@@ -138,7 +160,7 @@ int main(int argc, char *argv[])
138160
char outbase[MAXFILE],outfilename[MAXFILE];
139161

140162
printf("\n\n%s Assembler Version %s\n",PROCESSOR_NAME_STRING, VERSION_STRING);
141-
printf("Copyright (C) 2005-2012 by Texas Instruments Inc.\n\n");
163+
printf("Copyright (C) 2005-2013 by Texas Instruments Inc.\n\n");
142164

143165
/* Scan argv[0] to the final '/' in program name */
144166
i=0;
@@ -161,7 +183,10 @@ int main(int argc, char *argv[])
161183
if( argc<2 )
162184
{
163185
USAGE:
164-
printf("Usage: %s [-bcmLldz] [-Dname=value] [-Cname] InFile [OutFileBase]\n\n",argv[0]);
186+
printf("Usage: %s [-V#EBbcmLldz] [-Dname=value] [-Cname] InFile [OutFileBase]\n\n",argv[0]);
187+
printf(" V# - Specify core version (V0,V1,V2,V3). (Default is V1)\n");
188+
printf(" E - Assemble for big endian core\n");
189+
printf(" B - Create big endian binary output (*.bib)\n");
165190
printf(" b - Create little endian binary output (*.bin)\n");
166191
printf(" c - Create 'C array' binary output (*_bin.h)\n");
167192
printf(" m - Create 'image' binary output (*.img)\n");
@@ -248,6 +273,41 @@ int main(int argc, char *argv[])
248273
nameCArraySet = 1;
249274
break;
250275
}
276+
else if( *flags == 'V' )
277+
{
278+
flags++;
279+
if( *flags<'0' || *flags>'3' )
280+
{
281+
printf("\nExpected a number (0-3) after option 'V'\n\n");
282+
goto USAGE;
283+
}
284+
if( Core != CORE_NONE )
285+
{
286+
printf("\nDo not specify more than one core version or use -V with -X or -x\n\n");
287+
goto USAGE;
288+
}
289+
Core = CORE_V0 + *flags - '0';
290+
}
291+
else if( *flags == 'x' )
292+
{
293+
if( Core != CORE_NONE )
294+
{
295+
printf("\nDo not use -x with -X or -V\n\n");
296+
goto USAGE;
297+
}
298+
Core = CORE_V0;
299+
}
300+
else if( *flags == 'X' )
301+
{
302+
if( Core != CORE_NONE )
303+
{
304+
printf("\nDo not use -X with -x or -V\n\n");
305+
goto USAGE;
306+
}
307+
Core = CORE_V2;
308+
}
309+
else if( *flags == 'E' )
310+
Options |= OPTION_BIGENDIAN;
251311
else if( *flags == 'b' )
252312
Options |= OPTION_BINARY;
253313
else if( *flags == 'B' )

‎pru_sw/utils/pasm_source/pasm.h

100644100755
+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
//
5656
//---------------------------------------------------------------------------
5757
// Revision:
58-
// 15-Jun-12: 0.80 - Open source version
58+
// 21-Jun-13: 0.84 - Open source version
5959
============================================================================*/
6060
typedef unsigned int uint;
6161

@@ -147,7 +147,7 @@ extern uint RetRegField; /* Return register field */
147147
#define DEFAULT_RETREGVAL 30
148148
#define DEFAULT_RETREGFLD FIELDTYPE_15_0
149149

150-
#define SOURCEFILE_MAX 32
150+
#define SOURCEFILE_MAX 64
151151
extern SOURCEFILE sfArray[SOURCEFILE_MAX];
152152
extern unsigned int sfIndex;
153153

‎pru_sw/utils/pasm_source/pasmdbg.h

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
//
5656
//---------------------------------------------------------------------------
5757
// Revision:
58-
// 15-Jun-12: 0.80 - Open source version
58+
// 21-Jun-13: 0.84 - Open source version
5959
============================================================================*/
6060

6161
#define DBGFILE_NAMELEN_SHORT 64

‎pru_sw/utils/pasm_source/pasmdot.c

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
//
5454
//---------------------------------------------------------------------------
5555
// Revision:
56-
// 15-Jun-12: 0.80 - Open source version
56+
// 21-Jun-13: 0.84 - Open source version
5757
============================================================================*/
5858

5959
#include <stdio.h>

‎pru_sw/utils/pasm_source/pasmexp.c

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
//
5858
//---------------------------------------------------------------------------
5959
// Revision:
60-
// 15-Jun-12: 0.80 - Open source version
60+
// 21-Jun-13: 0.84 - Open source version
6161
============================================================================*/
6262

6363
#include <stdio.h>

‎pru_sw/utils/pasm_source/pasmmacro.c

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
//
5454
//---------------------------------------------------------------------------
5555
// Revision:
56-
// 15-Jun-12: 0.80 - Open source version
56+
// 21-Jun-13: 0.84 - Open source version
5757
============================================================================*/
5858

5959
#include <stdio.h>

0 commit comments

Comments
 (0)