diff --git a/compiler/src/Codec.cpp b/compiler/src/Codec.cpp
index 342fa13..d0ef983 100644
--- a/compiler/src/Codec.cpp
+++ b/compiler/src/Codec.cpp
@@ -209,7 +209,7 @@ void set_byte0(uint8_t* out, const std::string& prefix, uint32_t op) {
     } else if (prefix == "10") {
         out[0] = static_cast<uint8_t>(0x80 | (op & 0x3F));   // bit7..6 = 10
     } else if (prefix == "011") {
-        out[0] = static_cast<uint8_t>(0x40 | (op & 0x1F));
+        out[0] = static_cast<uint8_t>(0x60 | (op & 0x1F));   // bit7..5 = 011
     } else if (prefix.size() == 6 && prefix.compare(0, 3, "010") == 0) {
         const uint32_t shape = static_cast<uint32_t>(prefix[3] - '0') * 4 +
                                static_cast<uint32_t>(prefix[4] - '0') * 2 +
diff --git a/compiler/src/Codegen.cpp b/compiler/src/Codegen.cpp
index f4a824c..adf92a6 100644
--- a/compiler/src/Codegen.cpp
+++ b/compiler/src/Codegen.cpp
@@ -211,9 +211,13 @@ namespace {
             return s;
         }
 
-        /// 语言类型名 → func 位段值（MachineConfig 强校验保证存在）。
+        /// 语言类型名 → func 位段值（大小写不敏感：符号表存小写，type 表存大写）。
         uint8_t func_of_name(const std::string& type_name) const {
-            const ConfigType* t = cfg_.find_type(type_name);
+            std::string key = type_name;
+            for (char& ch : key) {
+                ch = static_cast<char>(std::toupper(static_cast<unsigned char>(ch)));
+            }
+            const ConfigType* t = cfg_.find_type(key);
             return t ? static_cast<uint8_t>(t->func) : 0;
         }
 
diff --git a/compiler/src/Typecheck.cpp b/compiler/src/Typecheck.cpp
index 50f652f..beae691 100644
--- a/compiler/src/Typecheck.cpp
+++ b/compiler/src/Typecheck.cpp
@@ -540,12 +540,27 @@ namespace {
                     if (!check_expr(file, sc, *e.lhs, &l) || !check_expr(file, sc, *e.rhs, &r)) {
                         return false;
                     }
-                    if (!resolve_to(file, *e.lhs, l, TType::Bool) ||
-                        !resolve_to(file, *e.rhs, r, TType::Bool)) {
-                        const char* op = (e.kind == ExprKind::And) ? "AND" : "OR";
-                        return fail(file, std::string(op) + " operands must be BOOL");
+                    const char* op = (e.kind == ExprKind::And) ? "AND" : "OR";
+                    // 两侧都是未定型字面量 → BOOL 逻辑（TRUE/FALSE 或 0/1）
+                    if (l == TType::Unresolved && r == TType::Unresolved) {
+                        if (!resolve_to(file, *e.lhs, l, TType::Bool) ||
+                            !resolve_to(file, *e.rhs, r, TType::Bool)) {
+                            return fail(file, std::string(op) + " operands must be BOOL");
+                        }
+                        *out = TType::Bool;
+                        return true;
                     }
-                    *out = TType::Bool;
+                    // 同型定型；允许 BOOL（逻辑）或位串（按宽度逐位）
+                    const TType want = (l == TType::Unresolved) ? r : l;
+                    if (!resolve_to(file, *e.lhs, l, want) ||
+                        !resolve_to(file, *e.rhs, r, want)) {
+                        return fail(file, std::string(op) + " operands must have same type");
+                    }
+                    const TypeMeta tm = type_meta(cfg_, tname_lower(want));
+                    if (want != TType::Bool && (!tm || tm.kind() != "bit")) {
+                        return fail(file, std::string(op) + " operands must be BOOL or bit-string");
+                    }
+                    *out = want;
                     return true;
                 }
                 case ExprKind::Cmp: {