Add Post Initialization for class Z::CPU

After the construction of the class CPU, the processor type and processor features are "true values" from the port library. Post initialization will change some of the values there needed for the compiler. Issue: #4339 Signed-off-by: Harry Yu <harryyu1994@gmail.com>
eclipse-omr · Feb 14, 2020 · 68cf4da · 68cf4da
1 parent 4054818
commit 68cf4da
Showing 1 changed file with 52 additions and 0 deletions.
diff --git a/compiler/z/env/OMRCPU.cpp b/compiler/z/env/OMRCPU.cpp
@@ -382,3 +382,55 @@ OMR::Z::CPU::isTargetWithinBranchRelativeRILRange(intptrj_t targetAddress, intpt
    return (targetAddress == sourceAddress + ((intptrj_t)((int32_t)((targetAddress - sourceAddress) / 2))) * 2) &&
             (targetAddress % 2 == 0);
    }
+
+void
+OMR::Z::CPU::postInitialization()
+   {
+   if (self()->isAtLeast(OMR_PROCESSOR_S390_Z10) && TR::Options::getCmdLineOptions()->getOption(TR_DisableZ10))
+      self()->setProcessor(OMR_PROCESSOR_S390_FIRST);
+   else if (self()->isAtLeast(OMR_PROCESSOR_S390_Z196) && TR::Options::getCmdLineOptions()->getOption(TR_DisableZ196))
+      self()->setProcessor(OMR_PROCESSOR_S390_Z10);
+   else if (self()->isAtLeast(OMR_PROCESSOR_S390_ZEC12) && TR::Options::getCmdLineOptions()->getOption(TR_DisableZEC12))
+      self()->setProcessor(OMR_PROCESSOR_S390_Z196);
+   else if (self()->isAtLeast(OMR_PROCESSOR_S390_Z13) && TR::Options::getCmdLineOptions()->getOption(TR_DisableZ13))
+      self()->setProcessor(OMR_PROCESSOR_S390_ZEC12);
+   else if (self()->isAtLeast(OMR_PROCESSOR_S390_Z14) && TR::Options::getCmdLineOptions()->getOption(TR_DisableZ14))
+      self()->setProcessor(OMR_PROCESSOR_S390_Z13);
+   else if (self()->isAtLeast(OMR_PROCESSOR_S390_Z15) && TR::Options::getCmdLineOptions()->getOption(TR_DisableZ15))
+      self()->setProcessor(OMR_PROCESSOR_S390_Z14);
+   else if (self()->isAtLeast(OMR_PROCESSOR_S390_ZNEXT) && TR::Options::getCmdLineOptions()->getOption(TR_DisableZNext))
+      self()->setProcessor(OMR_PROCESSOR_S390_Z15);
+
+   if (!self()->isAtLeast(OMR_PROCESSOR_S390_Z10))
+      {
+      self()->disableFeature(OMR_FEATURE_S390_DFP);
+      }
+
+   if (!self()->isAtLeast(OMR_PROCESSOR_S390_Z196))
+      {
+      self()->disableFeature(OMR_FEATURE_S390_HIGH_WORD);
+      }
+
+   if (!self()->isAtLeast(OMR_PROCESSOR_S390_ZEC12))
+      {
+      self()->disableFeature(OMR_FEATURE_S390_TE);
+      }
+
+   if (!self()->isAtLeast(OMR_PROCESSOR_S390_Z13))
+      {
+      self()->disableFeature(OMR_FEATURE_S390_VECTOR_FACILITY);
+      }
+
+   if (!self()->isAtLeast(OMR_PROCESSOR_S390_Z14))
+      {
+      self()->disableFeature(OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL);
+      }
+
+   if (!self()->isAtLeast(OMR_PROCESSOR_S390_Z15))
+      {
+      self()->disableFeature(OMR_FEATURE_S390_MISCELLANEOUS_INSTRUCTION_EXTENSION_3);
+      self()->disableFeature(OMR_FEATURE_S390_VECTOR_FACILITY_ENHANCEMENT_2);
+      self()->disableFeature(OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY);
+      }
+   }
+