Merge pull request #1964 from nicolasnoble/tpageloc-fix

nicolasnoble · web-flow · commit 87f8e8610839 · 2025-09-01T16:49:07.000-07:00
Properly returning a TPageLoc on TPageAttr::getPageLoc
diff --git a/src/mips/psyqo/primitives/common.hh b/src/mips/psyqo/primitives/common.hh
@@ -165,6 +165,7 @@ struct TPageLoc {
     }
 
   private:
+    TPageLoc(uint8_t i) : info(i) {}
     uint8_t info = 0;
     friend struct TPageAttr;
 };
@@ -246,7 +247,7 @@ struct TPageAttr {
     }
     uint8_t getPageX() const { return info & 0x000f; }
     uint8_t getPageY() const { return (info >> 4) & 0x0001; }
-    uint8_t getPageLoc() const { return info & 0x001f; }
+    TPageLoc getPageLoc() const { return TPageLoc(info & 0x001f); }
     Prim::TPageAttr::SemiTrans getSemiTrans() const {
         return static_cast<Prim::TPageAttr::SemiTrans>((info >> 5) & 0x0003);
     }

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ struct TPageLoc {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`private:`
	`168`	`+ TPageLoc(uint8_t i) : info(i) {}`
`168`	`169`	`uint8_t info = 0;`
`169`	`170`	`friend struct TPageAttr;`
`170`	`171`	`};`
`@@ -246,7 +247,7 @@ struct TPageAttr {`
`246`	`247`	`}`
`247`	`248`	`uint8_t getPageX() const { return info & 0x000f; }`
`248`	`249`	`uint8_t getPageY() const { return (info >> 4) & 0x0001; }`
`249`		`- uint8_t getPageLoc() const { return info & 0x001f; }`
	`250`	`+ TPageLoc getPageLoc() const { return TPageLoc(info & 0x001f); }`
`250`	`251`	`Prim::TPageAttr::SemiTrans getSemiTrans() const {`
`251`	`252`	`return static_cast<Prim::TPageAttr::SemiTrans>((info >> 5) & 0x0003);`
`252`	`253`	`}`