WIP: working on the next release

beagleboard · Jul 1, 2013 · 04d65d7 · 04d65d7
1 parent e363612
commit 04d65d7
Show file tree

Hide file tree

Showing 19 changed files with 513 additions and 50 deletions.
diff --git a/Documentation/01-AM335x_PRU_ICSS_Overview.pdf b/Documentation/01-AM335x_PRU_ICSS_Overview.pdf
diff --git a/Documentation/02-AM18x_PRUSS_to_AM335x_PRU-ICSS_Software_Migration_Guide.pdf b/Documentation/02-AM18x_PRUSS_to_AM335x_PRU-ICSS_Software_Migration_Guide.pdf
diff --git a/am335xPruPackage_1_1_Manifest.pdf b/am335xPruPackage_1_1_Manifest.pdf
diff --git a/am335xPruReferenceGuide.pdf b/am335xPruReferenceGuide.pdf
diff --git a/pru_sw/example_apps/Makefile b/pru_sw/example_apps/Makefile
@@ -1,27 +1,26 @@
--include DIRS
+-include DIRS
-
+
-CROSS_COMPILE?=arm-arago-linux-gnueabi-
+CROSS_COMPILE?=arm-arago-linux-gnueabi-
-LIBDIR_APP_LOADER?=../../app_loader/lib
+LIBDIR_APP_LOADER?=../../app_loader/lib
-INCDIR_APP_LOADER?=../../app_loader/include
+INCDIR_APP_LOADER?=../../app_loader/include
-BINDIR_APPLICATIONS?=../bin
+BINDIR_APPLICATIONS?=../bin
-BINDIR_FW?=bin
+BINDIR_FW?=bin
-PASM?=../utils/pasm
+PASM?=../utils/pasm_2
-
+
-all:
+all:
-# Make PRU example applications
+# Make PRU example applications
-	mkdir -p bin
+	mkdir -p bin
-
+
-	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
+	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
-
+
-# Pass PRU assembly code for each example through assembler
+# Pass PRU assembly code for each example through assembler
-	for a_file in ${ASSEM_FILES} ; \
+	for a_file in ${ASSEM_FILES} ; \
-	do \
+	do \
-          ${PASM} -b $$a_file ; \
+          ${PASM} -V3 -b $$a_file ; \
-	done ; \
+	done ; \
-	mv *.bin ${BINDIR_FW}
+	mv *.bin ${BINDIR_FW}
-
+
-clean:
+clean:
-	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
+	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
-
+
-	for bin_file in ${BIN_FILES}; do rm -fr ${BINDIR_FW}/$$bin_file; done
+	for bin_file in ${BIN_FILES}; do rm -fr ${BINDIR_FW}/$$bin_file; done
-
diff --git a/pru_sw/utils/pasm b/pru_sw/utils/pasm
diff --git a/pru_sw/utils/pasm_2 b/pru_sw/utils/pasm_2
diff --git a/pru_sw/utils/pasm_source/dosbuild.bat b/pru_sw/utils/pasm_source/dosbuild.bat
@@ -1,4 +1,3 @@
-cl -W3 -D_CRT_SECURE_NO_WARNINGS pasm.c pasmpp.c pasmexp.c pasmop.c pasmdot.c pasmstruct.c pasmmacro.c /Febin\pasm.exe
+cl -W3 -D_CRT_SECURE_NO_WARNINGS pasm.c pasmpp.c pasmexp.c pasmop.c pasmdot.c pasmstruct.c pasmmacro.c /Fe..\pasm.exe
 del *.obj
 
-
diff --git a/pru_sw/utils/pasm_source/pasm.c b/pru_sw/utils/pasm_source/pasm.c
@@ -58,7 +58,7 @@
 //
 //---------------------------------------------------------------------------
 // Revision:
-//     15-Jun-12: 0.80 - Open source version
+//     21-Jun-13: 0.84 - Open source version
 ============================================================================*/
 
 #include <stdio.h>
@@ -73,11 +73,33 @@
 #include "pasm.h"
 #include "pasmdbg.h"
 
+/*
+// Multiple Core Revision Support
+// ------------------------------
+//
+//  -V0  PRU Legacy        (same as -x)
+//  -V1  PRU Generation 1  (default)
+//       Adds [LMBD,SCAN,HALT,ZERO(1),MVI(1),SLP(1)]  Removes [LFC,STC]
+//  -V2  PRU Generation 2  (same as -X)
+//       Adds [ZERO(2),FILL,XIN,XOUT,XCHG,MVI(2)] Removes [SCAN]
+//  -V3  PRU Generation 3
+//       Adds [SLP(2),LOOP,ILOOP,SXIN,SXOUT,SXCHG,NOPx]
+//
+// ZERO(1) : Zero is multi-cycle pseudo op encoded via moves
+// ZERO(2) : Zero is single-cycle pseudo op encoded via XFR
+//
+// MVI(1)  : Pseudo op forms of MVI only
+// MVI(2)  : Pseudo op forms of MVI only
+//
+// SLP(1)  : SLP with trailing NOP
+// SLP(2)  : SLP without trailing NOP
+*/
+
 
 /* ---------- Local Macro Definitions ----------- */
 
 #define PROCESSOR_NAME_STRING ("PRU")
-#define VERSION_STRING        ("0.80")
+#define VERSION_STRING        ("0.84")
 
 #define MAXFILE               (256)     /* Max file length for output files */
 #define MAX_PROGRAM           (16384)   /* Max instruction count */
@@ -138,7 +160,7 @@ int main(int argc, char *argv[])
     char outbase[MAXFILE],outfilename[MAXFILE];
 
     printf("\n\n%s Assembler Version %s\n",PROCESSOR_NAME_STRING, VERSION_STRING);
-    printf("Copyright (C) 2005-2012 by Texas Instruments Inc.\n\n");
+    printf("Copyright (C) 2005-2013 by Texas Instruments Inc.\n\n");
 
     /* Scan argv[0] to the final '/' in program name */
     i=0;
@@ -161,7 +183,10 @@ int main(int argc, char *argv[])
     if( argc<2 )
     {
 USAGE:
-        printf("Usage: %s [-bcmLldz] [-Dname=value] [-Cname] InFile [OutFileBase]\n\n",argv[0]);
+        printf("Usage: %s [-V#EBbcmLldz] [-Dname=value] [-Cname] InFile [OutFileBase]\n\n",argv[0]);
+        printf("    V# - Specify core version (V0,V1,V2,V3). (Default is V1)\n");
+        printf("    E  - Assemble for big endian core\n");
+        printf("    B  - Create big endian binary output (*.bib)\n");
         printf("    b  - Create little endian binary output (*.bin)\n");
         printf("    c  - Create 'C array' binary output (*_bin.h)\n");
         printf("    m  - Create 'image' binary output (*.img)\n");
@@ -248,6 +273,41 @@ int main(int argc, char *argv[])
                     nameCArraySet = 1;
                     break;
                 }
+                else if( *flags == 'V' )
+                {
+                    flags++;
+                    if( *flags<'0' || *flags>'3' )
+                    {
+                        printf("\nExpected a number (0-3) after option 'V'\n\n");
+                        goto USAGE;
+                    }
+                    if( Core != CORE_NONE )
+                    {
+                        printf("\nDo not specify more than one core version or use -V with -X or -x\n\n");
+                        goto USAGE;
+                    }
+                    Core = CORE_V0 + *flags - '0';
+                }
+                else if( *flags == 'x' )
+                {
+                    if( Core != CORE_NONE )
+                    {
+                        printf("\nDo not use -x with -X or -V\n\n");
+                        goto USAGE;
+                    }
+                    Core = CORE_V0;
+                }
+                else if( *flags == 'X' )
+                {
+                    if( Core != CORE_NONE )
+                    {
+                        printf("\nDo not use -X with -x or -V\n\n");
+                        goto USAGE;
+                    }
+                    Core = CORE_V2;
+                }
+                else if( *flags == 'E' )
+                    Options |= OPTION_BIGENDIAN;
                 else if( *flags == 'b' )
                     Options |= OPTION_BINARY;
                 else if( *flags == 'B' )

diff --git a/pru_sw/utils/pasm_source/pasm.h b/pru_sw/utils/pasm_source/pasm.h
@@ -55,7 +55,7 @@
 //
 //---------------------------------------------------------------------------
 // Revision:
-//     15-Jun-12: 0.80 - Open source version
+//     21-Jun-13: 0.84 - Open source version
 ============================================================================*/
 typedef unsigned int uint;
 
@@ -147,7 +147,7 @@ extern uint RetRegField;            /* Return register field */
 #define DEFAULT_RETREGVAL   30
 #define DEFAULT_RETREGFLD   FIELDTYPE_15_0
 
-#define SOURCEFILE_MAX 32
+#define SOURCEFILE_MAX      64
 extern SOURCEFILE sfArray[SOURCEFILE_MAX];
 extern unsigned int sfIndex;
 

diff --git a/pru_sw/utils/pasm_source/pasmdbg.h b/pru_sw/utils/pasm_source/pasmdbg.h
@@ -55,7 +55,7 @@
 //
 //---------------------------------------------------------------------------
 // Revision:
-//     15-Jun-12: 0.80 - Open source version
+//     21-Jun-13: 0.84 - Open source version
 ============================================================================*/
 
 #define DBGFILE_NAMELEN_SHORT   64

diff --git a/pru_sw/utils/pasm_source/pasmdot.c b/pru_sw/utils/pasm_source/pasmdot.c
@@ -53,7 +53,7 @@
 //
 //---------------------------------------------------------------------------
 // Revision:
-//     15-Jun-12: 0.80 - Open source version
+//     21-Jun-13: 0.84 - Open source version
 ============================================================================*/
 
 #include <stdio.h>

diff --git a/pru_sw/utils/pasm_source/pasmexp.c b/pru_sw/utils/pasm_source/pasmexp.c
@@ -57,7 +57,7 @@
 //
 //---------------------------------------------------------------------------
 // Revision:
-//     15-Jun-12: 0.80 - Open source version
+//     21-Jun-13: 0.84 - Open source version
 ============================================================================*/
 
 #include <stdio.h>

diff --git a/pru_sw/utils/pasm_source/pasmmacro.c b/pru_sw/utils/pasm_source/pasmmacro.c
@@ -53,7 +53,7 @@
 //
 //---------------------------------------------------------------------------
 // Revision:
-//     15-Jun-12: 0.80 - Open source version
+//     21-Jun-13: 0.84 - Open source version
 ============================================================================*/
 
 #include <stdio.h>