Add port address spaces.

Author: jacobly0

Diff for: clang/lib/Basic/Targets/Z80.cpp

@@ -111,8 +111,14 @@ bool Z80TargetInfoBase::validateAsmConstraint(
   case 'I': // bit offset within byte [0,7]
     Info.setRequiresImmediate(0, 7);
     return true;
-  case 'J': // port address [0,255]
-    Info.setRequiresImmediate(0, 255);
+  case 'J': // immediate [0,0xFF]
+    Info.setRequiresImmediate(0, 0xFF);
+    return true;
+  case 'K': // immediate [0,0xFFFF]
+    Info.setRequiresImmediate(0, 0xFFFF);
+    return true;
+  case 'L': // immediate [0,0xFFFFFF]
+    Info.setRequiresImmediate(0, 0xFFFFFF);
     return true;
   case 'M': // im mode [0,2]
     Info.setRequiresImmediate(0, 2);

Diff for: clang/lib/Basic/Targets/Z80.h

@@ -65,7 +65,7 @@ class LLVM_LIBRARY_VISIBILITY Z80TargetInfo : public Z80TargetInfoBase {
   explicit Z80TargetInfo(const llvm::Triple &T, const TargetOptions &Opts)
       : Z80TargetInfoBase(T, Opts) {
     PointerWidth = IntWidth = 16;
-    resetDataLayout("e-m:z-p:16:8-p1:8:8-i16:8-i24:8-i32:8-i48:8-i64:8-i96:8-"
+    resetDataLayout("e-m:z-p:16:8-p2:8:8-p3:16:8-i16:8-i24:8-i32:8-i48:8-i64:8-i96:8-"
                     "f32:8-f64:8-a:8-n8:16-S8", "_");
   }
 
@@ -87,11 +87,11 @@ class LLVM_LIBRARY_VISIBILITY EZ80TargetInfo : public Z80TargetInfoBase {
       : Z80TargetInfoBase(T, Opts) {
     if (T.getEnvironment() == llvm::Triple::CODE16) {
       PointerWidth = IntWidth = 16;
-      resetDataLayout("e-m:z-p:16:8-p1:16:8-p2:24:8-i16:8-i24:8-i32:8-i48:8-"
+      resetDataLayout("e-m:z-p:16:8-p1:24:8-p2:8:8-p3:16:8-p4:24:8-i16:8-i24:8-i32:8-i48:8-"
                       "i64:8-i96:8-f32:8-f64:8-a:8-n8:16-S8", "_");
     } else {
       PointerWidth = IntWidth = 24;
-      resetDataLayout("e-m:z-p:24:8-p1:16:8-p2:16:8-i16:8-i24:8-i32:8-i48:8-"
+      resetDataLayout("e-m:z-p:24:8-p1:16:8-p2:8:8-p3:16:8-p4:24:8-i16:8-i24:8-i32:8-i48:8-"
                       "i64:8-i96:8-f32:8-f64:8-a:8-n8:16:24-S8", "_");
     }
   }

Diff for: llvm/include/llvm/Target/GlobalISel/Combine.td

@@ -1032,7 +1032,7 @@ def lower_is_power_of_two : GICombineRule<
 def simplify_const_matchdata : GIDefMatchData<"Optional<ValueAndVReg>">;
 def simplify_const : GICombineRule<
   (defs root:$mi, simplify_const_matchdata:$matchinfo),
-  (match (wip_match_opcode G_INTTOPTR, G_TRUNC, G_SEXT, G_ZEXT):$mi,
+  (match (wip_match_opcode G_TRUNC, G_SEXT, G_ZEXT):$mi,
          [{ ${matchinfo} = getIConstantVRegValWithLookThrough(
                 ${mi}->getOperand(0).getReg(), MRI);
             return ${matchinfo}.hasValue(); }]),