Updated to release v2.1.

Intended to be the basis for the VSM development.

5 files changed, 102 insertions, 128 deletions

diff --git a/acsr/c_helpers.c b/acsr/c_helpers.c
index 5137140..ac181d8 100644
--- a/acsr/c_helpers.c
+++ b/acsr/c_helpers.c
@@ -1,30 +1,24 @@
 /*
-  Copyright (c) 2009-11, ARM Limited. All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-   * Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-   * Neither the name of ARM nor the names of its contributors may be used to
-     endorse or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.
-*/
+ * Copyright (c) 2011, ARM Limited. All rights reserved.
+ *       
+ * Redistribution and use in source and binary forms, with
+ * or without modification, are permitted provided that the
+ * following conditions are met:
+ *     
+ * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the 
+ * following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and 
+ * the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution.
+ *      
+ * Neither the name of ARM nor the names of its
+ * contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.                        
+ */ 
  
  
 /**
diff --git a/acsr/helpers.h b/acsr/helpers.h
index 0c7fd40..2d8b06f 100644
--- a/acsr/helpers.h
+++ b/acsr/helpers.h
@@ -1,30 +1,24 @@
 /*
-  Copyright (c) 2009-11, ARM Limited. All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-   * Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-   * Neither the name of ARM nor the names of its contributors may be used to
-     endorse or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.
-*/
+ * Copyright (c) 2011, ARM Limited. All rights reserved.
+ *       
+ * Redistribution and use in source and binary forms, with
+ * or without modification, are permitted provided that the
+ * following conditions are met:
+ *     
+ * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the 
+ * following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and 
+ * the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution.
+ *      
+ * Neither the name of ARM nor the names of its
+ * contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.                        
+ */ 
 
 /*
  * V7 functions
diff --git a/acsr/helpers.s b/acsr/helpers.s
index c19fa48..99bb2a6 100644
--- a/acsr/helpers.s
+++ b/acsr/helpers.s
@@ -1,28 +1,24 @@
-;  Copyright (c) 2009-11, ARM Limited. All rights reserved.
-;  
-;  Redistribution and use in source and binary forms, with or without
-;  modification, are permitted provided that the following conditions are met:
-;
-;   * Redistributions of source code must retain the above copyright notice,
-;     this list of conditions and the following disclaimer.
-;   * Redistributions in binary form must reproduce the above copyright notice,
-;     this list of conditions and the following disclaimer in the documentation
-;     and/or other materials provided with the distribution.
-;   * Neither the name of ARM nor the names of its contributors may be used to
-;     endorse or promote products derived from this software without specific
-;     prior written permission.
-;
-;   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-;   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-;   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-;   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-;   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-;   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-;   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-;   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-;   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-;   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-;   POSSIBILITY OF SUCH DAMAGE.
+	;
+ 	; Copyright (c) 2011, ARM Limited. All rights reserved.
+ 	;       
+ 	; Redistribution and use in source and binary forms, with
+ 	; or without modification, are permitted provided that the
+ 	; following conditions are met:
+ 	;     
+ 	; Redistributions of source code must retain the above
+ 	; copyright notice, this list of conditions and the 
+ 	; following disclaimer.
+ 	;
+ 	; Redistributions in binary form must reproduce the
+ 	; above copyright notice, this list of conditions and 
+ 	; the following disclaimer in the documentation 
+ 	; and/or other materials provided with the distribution.
+ 	;      
+ 	; Neither the name of ARM nor the names of its
+ 	; contributors may be used to endorse or promote products
+ 	; derived from this software without specific prior written
+ 	; permission.                        
+ 	; 
 
 	EXPORT isb	
 	EXPORT dsb
diff --git a/acsr/v7.s b/acsr/v7.s
index 180fc93..ffd1b06 100644
--- a/acsr/v7.s
+++ b/acsr/v7.s
@@ -1,28 +1,24 @@
-;  Copyright (c) 2009-11, ARM Limited. All rights reserved.
-;  
-;  Redistribution and use in source and binary forms, with or without
-;  modification, are permitted provided that the following conditions are met:
-;
-;   * Redistributions of source code must retain the above copyright notice,
-;     this list of conditions and the following disclaimer.
-;   * Redistributions in binary form must reproduce the above copyright notice,
-;     this list of conditions and the following disclaimer in the documentation
-;     and/or other materials provided with the distribution.
-;   * Neither the name of ARM nor the names of its contributors may be used to
-;     endorse or promote products derived from this software without specific
-;     prior written permission.
-;
-;   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-;   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-;   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-;   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-;   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-;   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-;   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-;   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-;   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-;   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-;   POSSIBILITY OF SUCH DAMAGE.
+	;
+ 	; Copyright (c) 2011, ARM Limited. All rights reserved.
+ 	;       
+ 	; Redistribution and use in source and binary forms, with
+ 	; or without modification, are permitted provided that the
+ 	; following conditions are met:
+ 	;     
+ 	; Redistributions of source code must retain the above
+ 	; copyright notice, this list of conditions and the 
+ 	; following disclaimer.
+ 	;
+ 	; Redistributions in binary form must reproduce the
+ 	; above copyright notice, this list of conditions and 
+ 	; the following disclaimer in the documentation 
+ 	; and/or other materials provided with the distribution.
+ 	;      
+ 	; Neither the name of ARM nor the names of its
+ 	; contributors may be used to endorse or promote products
+ 	; derived from this software without specific prior written
+ 	; permission.                        
+ 	; 
 
 	EXPORT save_performance_monitors
 	EXPORT restore_performance_monitors
diff --git a/acsr/v7_c.c b/acsr/v7_c.c
index beed7df..9f8cc11 100644
--- a/acsr/v7_c.c
+++ b/acsr/v7_c.c
@@ -1,30 +1,24 @@
 /*
-  Copyright (c) 2009-11, ARM Limited. All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-   * Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-   * Neither the name of ARM nor the names of its contributors may be used to
-     endorse or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.
-*/
+ * Copyright (c) 2011, ARM Limited. All rights reserved.
+ *       
+ * Redistribution and use in source and binary forms, with
+ * or without modification, are permitted provided that the
+ * following conditions are met:
+ *     
+ * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the 
+ * following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and 
+ * the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution.
+ *      
+ * Neither the name of ARM nor the names of its
+ * contributors may be used to endorse or promote products
+ * derived from this software without specific prior written
+ * permission.                        
+ */ 
  
 /*
  * The code to save and restore debug context uses the memory-mapped interface.