Odyssey r187682

CMakeLists.txt

@@ -97,6 +97,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
     set(WTF_CPU_X86_64 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
     set(WTF_CPU_X86 1)
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "m68k")
+    set(WTF_CPU_M68K 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
     set(WTF_CPU_PPC 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")

Source/JavaScriptCore/API/JSStringRef.cpp

@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
 JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
 {
     initializeThreading();
-    return &OpaqueJSString::create(chars, numChars).leakRef();
+    return &OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
 }
 
 JSStringRef JSStringCreateWithUTF8CString(const char* string)
@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
 JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
 {
     initializeThreading();
-    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
+    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars)).leakRef();
 }
 
 JSStringRef JSStringRetain(JSStringRef string)
@@ -87,7 +87,7 @@ const JSChar* JSStringGetCharactersPtr(JSStringRef string)
 {
     if (!string)
         return nullptr;
-    return string->characters();
+    return reinterpret_cast<const JSChar*>(string->characters());
 }
 
 size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)

Source/JavaScriptCore/CMakeLists.txt

@@ -1147,6 +1147,7 @@ endif ()
 if (WTF_CPU_ARM)
 elseif (WTF_CPU_ARM64)
 elseif (WTF_CPU_HPPA)
+elseif (WTF_CPU_M68K)
 elseif (WTF_CPU_PPC)
 elseif (WTF_CPU_PPC64)
 elseif (WTF_CPU_PPC64LE)
@@ -1174,8 +1175,10 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
 WEBKIT_CREATE_FORWARDING_HEADERS(JavaScriptCore DIRECTORIES ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${JavaScriptCore_FORWARDING_HEADERS_FILES})
 
-
-add_subdirectory(shell)
+if (${PORT} STREQUAL "MUI")
+else ()
+    add_subdirectory(shell)
+endif ()
 
 WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
 include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES})

Source/JavaScriptCore/runtime/JSObject.cpp

@@ -1952,6 +1952,11 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un
     }
 }
 
+// Explicit instantiations needed by JSArray.cpp.
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
+
 void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
 {
     VM& vm = exec->vm();

Source/WTF/wtf/MathExtras.h

@@ -93,33 +93,6 @@ inline bool isinf(double x) { return !finite(x) && !isnand(x); }
 
 #endif
 
-#if OS(AROS)
-
-#undef isinf
-#undef isnan
-#undef isfinite
-#undef signbit
-
-namespace std {
-
-inline bool isinf(double num) { return __isinf(num); }
-inline bool isnan(double num) { return __isnan(num); }
-inline bool isfinite(double x) { return __isfinite(x); }
-inline bool signbit(double num) { return __signbit(num); }
-
-} // namespace std
-
-inline double log2(double num)
-{
-    return log(num) / 0.693147180559945309417232121458176568;
-}
-
-inline float log2f(float num)
-{
-    return logf(num) / 0.693147180559945309417232121458176568f;
-}
-#endif
-
 #if COMPILER(MSVC)
 
 // Work around a bug in Win, where atan2(+-infinity, +-infinity) yields NaN instead of specific values.

Source/WTF/wtf/Platform.h

@@ -103,6 +103,16 @@
 #define USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
 #endif /* MIPS */
 
+/* CPU(M68K) - m68k */
+#if    defined(__m68k__)       \
+    || defined(__m68000__)     \
+    || defined(__mc68000__)    \
+    || defined(__mc68020__)    \
+    || defined(_M_M68K)
+#define WTF_CPU_M68K 1
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
 /* CPU(PPC) - PowerPC 32-bit */
 #if (  defined(__ppc__)        \
     || defined(__PPC__)        \
@@ -862,7 +872,7 @@
 #define ENABLE_REGEXP_TRACING 0
 
 /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
-#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT)
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !CPU(M68K)
 #define ENABLE_YARR_JIT 1
 
 /* Setting this flag compares JIT results with interpreter results. */

Source/WTF/wtf/StdLibExtras.h

@@ -88,7 +88,7 @@
  * - https://bugs.webkit.org/show_bug.cgi?id=38045
  * - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43976
  */
-#if (CPU(ARM) || CPU(MIPS)) && COMPILER(GCC)
+#if (CPU(ARM) || CPU(MIPS) || CPU(M68K)) && COMPILER(GCC)
 template<typename Type>
 inline bool isPointerTypeAlignmentOkay(Type* ptr)
 {

Source/WTF/wtf/dtoa/utils.h

@@ -51,6 +51,8 @@ defined(_MIPS_ARCH_MIPS32R2)
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
 #elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+#elif CPU(M68K)
+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
 #elif defined(_M_IX86) || defined(__i386__)
 #if defined(_WIN32)
 // Windows uses a 64bit wide floating point stack.

Source/WebCore/css/CSSProperty.cpp

@@ -35,7 +35,7 @@ struct SameSizeAsCSSProperty {
     void* value;
 };
 
-COMPILE_ASSERT(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small);
+COMPILE_ASSERT(sizeof(CSSProperty) <= sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small);
 
 CSSPropertyID StylePropertyMetadata::shorthandID() const
 {

Source/WebCore/css/RuleSet.h

@@ -141,7 +141,7 @@ struct SameSizeAsRuleData {
     unsigned d[4];
 };
 
-COMPILE_ASSERT(sizeof(RuleData) == sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
+COMPILE_ASSERT(sizeof(RuleData) <= sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
 
 class RuleSet {
     WTF_MAKE_NONCOPYABLE(RuleSet); WTF_MAKE_FAST_ALLOCATED;

Source/WebCore/dom/ElementRareData.cpp

@@ -42,6 +42,6 @@ struct SameSizeAsElementRareData : NodeRareData {
     void* pointers[7];
 };
 
-static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
+static_assert(sizeof(ElementRareData) <= sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
 
 } // namespace WebCore

Source/WebCore/dom/NodeRareData.cpp

@@ -38,6 +38,6 @@ struct SameSizeAsNodeRareData {
     void* m_pointer[3];
 };
 
-COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
+COMPILE_ASSERT(sizeof(NodeRareData) <= sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
 
 } // namespace WebCore

Source/WebCore/dom/ShadowRoot.cpp

@@ -42,7 +42,7 @@ struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope {
     void* host;
 };
 
-COMPILE_ASSERT(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
+COMPILE_ASSERT(sizeof(ShadowRoot) <= sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
 
 enum ShadowRootUsageOriginType {
     ShadowRootUsageOriginWeb = 0,

Source/WebCore/platform/mui/acinerella.c

@@ -29,6 +29,7 @@
 #include "libavutil/avutil.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/opt.h"
+#include "libavutil/pixfmt.h"
 #include "libswscale/swscale.h"
 #include "libswresample/swresample.h"
 #include <string.h>
@@ -253,6 +254,8 @@ static struct URLProtocol OWBProtocol =
 	"owb",
 	&file_open,
 	NULL,
+	NULL,
+	NULL,
 	&file_read,
 	&file_write,
 	&file_seek,
@@ -264,9 +267,15 @@ static struct URLProtocol OWBProtocol =
 	NULL,
 	NULL,
 	0,
-	NULL,
 	0,
-	NULL
+	0,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	0
 };
 
 lp_ac_package ac_flush_packet(void)

Source/WebCore/rendering/shapes/BoxShape.cpp

@@ -43,7 +43,7 @@ static inline LayoutUnit adjustRadiusForMarginBoxShape(LayoutUnit radius, Layout
 
     LayoutUnit ratio = radius / margin;
     if (ratio < 1)
-        return radius + (margin * (1 + pow(ratio - 1, 3)));
+        return radius + (margin * (1 + pow(ratio - 1, 3.0)));
 
     return radius + margin;
 }

Source/WebCore/rendering/style/RenderStyle.cpp

@@ -64,7 +64,7 @@ struct SameSizeAsBorderValue {
     int m_restBits;
 };
 
-COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
+COMPILE_ASSERT(sizeof(BorderValue) <= sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
 
 struct SameSizeAsRenderStyle : public RefCounted<SameSizeAsRenderStyle> {
     void* dataRefs[7];
@@ -79,7 +79,7 @@ struct SameSizeAsRenderStyle : public RefCounted<SameSizeAsRenderStyle> {
     } noninherited_flags;
 };
 
-COMPILE_ASSERT(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), RenderStyle_should_stay_small);
+COMPILE_ASSERT(sizeof(RenderStyle) <= sizeof(SameSizeAsRenderStyle), RenderStyle_should_stay_small);
 
 inline RenderStyle& defaultStyle()
 {

Source/WebCore/rendering/style/StyleBoxData.cpp

@@ -33,7 +33,7 @@ struct SameSizeAsStyleBoxData : public RefCounted<SameSizeAsStyleBoxData> {
     uint32_t bitfields;
 };
 
-COMPILE_ASSERT(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow);
+COMPILE_ASSERT(sizeof(StyleBoxData)<= sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow);
 
 StyleBoxData::StyleBoxData()
     : m_minWidth(RenderStyle::initialMinSize())

Source/WebKit/mui/Api/MorphOS/appclass.cpp

@@ -2646,7 +2646,7 @@ DEFSMETHOD(OWBApp_SaveFormState)
 				{
 					D(kprintf("Valid formdata found for <%s>\n", webFormPasswordData.origin.string().latin1().data()));
 
-					if(getv(app, MA_OWBApp_SaveFormCredentials) && DoMethod(data->passwordmanagerwin, MM_PasswordManagerGroup_Get, &(webFormPasswordData.origin.string())) == NULL)
+					if(getv(app, MA_OWBApp_SaveFormCredentials) && DoMethod(data->passwordmanagerwin, MM_PasswordManagerGroup_Get, &(webFormPasswordData.origin.string())) == 0)
 					{
 						ExtCredential extCredential(webFormPasswordData.userNameValue,
 													webFormPasswordData.passwordValue,

Source/WebKit/mui/Api/MorphOS/aros_stuff.c

@@ -128,22 +128,36 @@ static void aros_crash_handler()
     }
 }
 
-static void aros_trap_handler(ULONG trapNum, BYTE * p)
+/*
+  NB /TODO:
+ This currently uses hard coded values, since the name/offset of the PC is different for different archetectures.
+ arch/<cpu>-all/include/aros/cpucontext.h defines the relevant offsets for a given platform, but there is no
+ mechanism to set the PC value genericaly - consider adding a macro to each CPU's cpucontext.h that sets the correct
+ entry in its specific context structure, and directly include the file here so that we can use the macro instead.
+*/
+#if defined(__x86_64__)
+#  define PCOFFSET 168
+#elif defined(__i386__)
+#  define PCOFFSET 48
+#elif defined(__mc68000__)
+#  define PCOFFSET 64
+#elif defined(__arm__)
+#  define PCOFFSET 60
+#elif defined(__powerpc__)
+#  define PCOFFSET 12
+#else
+#error your architecture is currently unsupported - please check cpucontext.h and adjust this code.
+#endif
+
+static void aros_trap_handler(IPTR trapNum, IPTR * p)
 {
     /* Restore original handler in case we double-crash */
     struct Task * thistask = FindTask(NULL);
-
     thistask->tc_TrapCode = oldtraphandler;
     trapnumber = trapNum | AT_DeadEnd;
-
-#if defined (__i386__)
-    /* Set the eip to aros_crash_handler */
-    /* NOTE: This changes private structure and might stop working when the structure changes! */
-    crashlocation = (APTR)*((ULONG*)(p + 48));
-    *((ULONG*)(p + 48)) = (ULONG)aros_crash_handler;
-#else
-#error program counter setting code missing for your architecture
-#endif
+    /* Set the current contexts program counter to aros_crash_handler */
+    crashlocation = (APTR)*((IPTR*)(p + PCOFFSET));
+    *((IPTR*)(p + PCOFFSET)) = (IPTR)aros_crash_handler;
 }
 
 void aros_register_trap_handler()

Source/WebKit/mui/Api/MorphOS/owbbrowserclass.cpp

@@ -2713,7 +2713,7 @@ DEFSMETHOD(OWBBrowser_PopupMenu)
     data->cancelledHook.h_SubEntry = (APTR) cancelled;
 
     data->hideHook.h_Entry = (APTR) HookEntry;
-    data->hideHook.h_SubEntry = (APTR) (HOOKFUNC) closed;
+    data->hideHook.h_SubEntry = (APTR) closed;
 
     DoMethod(list, MUIM_Notify, MUIA_List_Active, MUIV_EveryTime,
         list, 3,
@@ -4039,7 +4039,7 @@ typedef struct
 // It has some sideeffects for pages that want to paint over plugin area
 DEFSMETHOD(Plugin_RenderRastPort)
 {
-	if(msg->src == NULL && msg->stride == NULL)
+	if(msg->src == NULL && msg->stride == 0)
 	{
 		PluginRect *npwindowrect = (PluginRect *) msg->windowrect;
 		IntRect windowrect(npwindowrect->x, npwindowrect->y, npwindowrect->width, npwindowrect->height);

Source/WebKit/mui/Api/MorphOS/owbwindowclass.cpp

@@ -3246,6 +3246,7 @@ DEFTMETHOD(OWBWindow_RemoveHistoryPanel)
 
 DEFSMETHOD(OWBWindow_AddClosedView)
 {
+#if !defined(__mc68000__)
 	GETDATA;
 #define MAX_CLOSED_VIEWS_COUNT 20
 
@@ -3333,12 +3334,13 @@ DEFSMETHOD(OWBWindow_AddClosedView)
 			}
 		}
 	}
-
+#endif
 	return 0;
 }
 
 DEFSMETHOD(OWBWindow_AddHistoryItem)
 {
+#if !defined(__mc68000__)
 #define MAX_HISTORY_ENTRIES_COUNT 20
 	GETDATA;
 	WebHistoryItem *s = (WebHistoryItem *) msg->item;
@@ -3442,7 +3444,7 @@ DEFSMETHOD(OWBWindow_AddHistoryItem)
 		free(title);
 		free(url);
 	}
-
+#endif
 	return 0;
 }
 

Source/WebKit/mui/Api/MorphOS/scriptmanagergroupclass.cpp

@@ -388,10 +388,10 @@ DEFTMETHOD(ScriptManagerGroup_Add)
 {
 	GETDATA;
 
-	APTR tags[] = { (APTR) ASLFR_TitleText, (APTR) GSI(MSG_SCRIPTMANAGERGROUP_SCRIPT_SELECT),
-					(APTR) ASLFR_InitialPattern, (APTR) "#?.js",
-					(APTR) ASLFR_InitialDrawer, (APTR) SCRIPT_DIRECTORY,
-					TAG_DONE };
+	struct TagItem tags[] = { ASLFR_TitleText, (IPTR) GSI(MSG_SCRIPTMANAGERGROUP_SCRIPT_SELECT),
+				ASLFR_InitialPattern, (IPTR) "#?.js",
+				ASLFR_InitialDrawer, (IPTR) SCRIPT_DIRECTORY,
+				TAG_DONE, 0 };
 
 	char *file = asl_run(SCRIPT_DIRECTORY, (struct TagItem *) &tags, FALSE);