Fix fastCodeAt on cppia for HaxeFoundation/haxe#7506

hughsando · hughsando · commit 4594b3a63087 · 2018-10-10T14:48:43.000+08:00
diff --git a/src/hx/cppia/StringBuiltin.cpp b/src/hx/cppia/StringBuiltin.cpp
@@ -154,7 +154,7 @@ struct CharAtExpr : public StringExpr
       BCR_CHECK;
 
       if (AS_INT)
-         return (int)( ((unsigned char *)val.__s) [idx]);
+         return (int)val.cca(idx);
       else
          return val.charCodeAt(idx);
    }
@@ -168,7 +168,7 @@ struct CharAtExpr : public StringExpr
       if (CODE)
       {
          if (AS_INT)
-            return Dynamic( (int)( ((unsigned char *)val.__s) [idx]) ).mPtr;
+            return Dynamic( val.cca(idx) ).mPtr;
          else
             return val.charCodeAt(idx).mPtr;
       }
@@ -181,6 +181,10 @@ struct CharAtExpr : public StringExpr
    {
       return (inValue->charCodeAt(inIndex)).mPtr;
    }
+   static int SLJIT_CALL runCca(String *inValue, int inIndex)
+   {
+      return (inValue->cca(inIndex));
+   }
    static void SLJIT_CALL runCharAt(String *ioValue, int inIndex)
    {
       *ioValue = ioValue->charAt(inIndex);
@@ -196,6 +200,10 @@ struct CharAtExpr : public StringExpr
       {
          if (AS_INT)
          {
+            #ifdef HX_SMART_STRINGS
+            compiler->callNative( (void *)runCca, value, sJitTemp1.as(jtInt));
+            compiler->convertReturnReg( etInt, inDest, destType);
+            #else
             // sJitTemp1 = __s
             compiler->move( sJitTemp0.as(jtPointer), value.star(jtPointer,offsetof(String,__s)) );
             if (destType==etInt)
@@ -207,6 +215,7 @@ struct CharAtExpr : public StringExpr
                compiler->move(sJitTemp0.as(jtInt), sJitTemp0.atReg(sJitTemp1,0,jtByte) );
                compiler->convertReturnReg(etInt, inDest, destType);
             }
+            #endif
          }
          else
          {

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ struct CharAtExpr : public StringExpr`
`154`	`154`	`BCR_CHECK;`
`155`	`155`
`156`	`156`	`if (AS_INT)`
`157`		`- return (int)( ((unsigned char *)val.__s) [idx]);`
	`157`	`+ return (int)val.cca(idx);`
`158`	`158`	`else`
`159`	`159`	`return val.charCodeAt(idx);`
`160`	`160`	`}`
`@@ -168,7 +168,7 @@ struct CharAtExpr : public StringExpr`
`168`	`168`	`if (CODE)`
`169`	`169`	`{`
`170`	`170`	`if (AS_INT)`
`171`		`- return Dynamic( (int)( ((unsigned char *)val.__s) [idx]) ).mPtr;`
	`171`	`+ return Dynamic( val.cca(idx) ).mPtr;`
`172`	`172`	`else`
`173`	`173`	`return val.charCodeAt(idx).mPtr;`
`174`	`174`	`}`
`@@ -181,6 +181,10 @@ struct CharAtExpr : public StringExpr`
`181`	`181`	`{`
`182`	`182`	`return (inValue->charCodeAt(inIndex)).mPtr;`
`183`	`183`	`}`
	`184`	`+ static int SLJIT_CALL runCca(String *inValue, int inIndex)`
	`185`	`+ {`
	`186`	`+ return (inValue->cca(inIndex));`
	`187`	`+ }`
`184`	`188`	`static void SLJIT_CALL runCharAt(String *ioValue, int inIndex)`
`185`	`189`	`{`
`186`	`190`	`*ioValue = ioValue->charAt(inIndex);`
`@@ -196,6 +200,10 @@ struct CharAtExpr : public StringExpr`
`196`	`200`	`{`
`197`	`201`	`if (AS_INT)`
`198`	`202`	`{`
	`203`	`+ #ifdef HX_SMART_STRINGS`
	`204`	`+ compiler->callNative( (void *)runCca, value, sJitTemp1.as(jtInt));`
	`205`	`+ compiler->convertReturnReg( etInt, inDest, destType);`
	`206`	`+ #else`
`199`	`207`	`// sJitTemp1 = __s`
`200`	`208`	`compiler->move( sJitTemp0.as(jtPointer), value.star(jtPointer,offsetof(String,__s)) );`
`201`	`209`	`if (destType==etInt)`
`@@ -207,6 +215,7 @@ struct CharAtExpr : public StringExpr`
`207`	`215`	`compiler->move(sJitTemp0.as(jtInt), sJitTemp0.atReg(sJitTemp1,0,jtByte) );`
`208`	`216`	`compiler->convertReturnReg(etInt, inDest, destType);`
`209`	`217`	`}`
	`218`	`+ #endif`
`210`	`219`	`}`
`211`	`220`	`else`
`212`	`221`	`{`