Merge

Author: JesperIRL

make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,14 +41,13 @@ class CopyrightHeaders {
         " * Copyright (c) 2012, %d, Oracle and/or its affiliates. All rights reserved.\n" +
         " */\n";
 
-    // Last updated:  - 6/06/2016, 1:42:31 PM
+    // Last updated:  - 1/04/2021
     private static final String UNICODE =
         "/*\n" +
         " * COPYRIGHT AND PERMISSION NOTICE\n" +
         " *\n" +
-        " * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.\n" +
-        " * Distributed under the Terms of Use in \n" +
-        " * http://www.unicode.org/copyright.html.\n" +
+        " * Copyright (c) 1991-2020 Unicode, Inc. All rights reserved.\n" +
+        " * Distributed under the Terms of Use in https://www.unicode.org/copyright.html.\n" +
         " *\n" +
         " * Permission is hereby granted, free of charge, to any person obtaining\n" +
         " * a copy of the Unicode data files and any associated documentation\n" +
@@ -57,14 +56,11 @@ class CopyrightHeaders {
         " * without restriction, including without limitation the rights to use,\n" +
         " * copy, modify, merge, publish, distribute, and/or sell copies of\n" +
         " * the Data Files or Software, and to permit persons to whom the Data Files\n" +
-        " * or Software are furnished to do so, provided that\n" +
-        " * (a) this copyright and permission notice appear with all copies \n" +
-        " * of the Data Files or Software,\n" +
-        " * (b) this copyright and permission notice appear in associated \n" +
-        " * documentation, and\n" +
-        " * (c) there is clear notice in each modified Data File or in the Software\n" +
-        " * as well as in the documentation associated with the Data File(s) or\n" +
-        " * Software that the data or software has been modified.\n" +
+        " * or Software are furnished to do so, provided that either\n" +
+        " * (a) this copyright and permission notice appear with all copies\n" +
+        " * of the Data Files or Software, or\n" +
+        " * (b) this copyright and permission notice appear in associated\n" +
+        " * Documentation.\n" +
         " *\n" +
         " * THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF\n" +
         " * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" +

src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp

@@ -315,18 +315,19 @@ void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_ve
   }
 
   if (restore_vectors) {
+    off = additional_frame_bytes - ymm_bytes;
+    // Restore upper half of YMM registers.
+    for (int n = 0; n < num_xmm_regs; n++) {
+      __ vinsertf128_high(as_XMMRegister(n), Address(rsp, n*16+off));
+    }
+
     if (UseAVX > 2) {
       // Restore upper half of ZMM registers.
       for (int n = 0; n < num_xmm_regs; n++) {
         __ vinsertf64x4_high(as_XMMRegister(n), Address(rsp, n*32));
       }
-      __ addptr(rsp, zmm_bytes);
-    }
-    // Restore upper half of YMM registers.
-    for (int n = 0; n < num_xmm_regs; n++) {
-      __ vinsertf128_high(as_XMMRegister(n), Address(rsp, n*16));
     }
-    __ addptr(rsp, ymm_bytes);
+    __ addptr(rsp, additional_frame_bytes);
   }
 
   __ pop_FPU_state();