[Vm-dev] [commit][3091] update ARM mvm etc files to include cleaner
fastblt building
commits at squeakvm.org
commits at squeakvm.org
Fri Oct 3 00:09:21 UTC 2014
Revision: 3091
Author: rowledge
Date: 2014-10-02 17:09:21 -0700 (Thu, 02 Oct 2014)
Log Message:
-----------
update ARM mvm etc files to include cleaner fastblt building
Modified Paths:
--------------
branches/Cog/platforms/unix/vm/sqUnixEvent.c
branches/Cog/platforms/unix/vm/sqUnixVMProfile.c
branches/Cog/platforms/unix/vm-display-X11/Makefile.in
branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c
Added Paths:
-----------
branches/Cog/platforms/unix/plugins/BitBltPlugin/
branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in
Added: branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in
===================================================================
--- branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in (rev 0)
+++ branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in 2014-10-03 00:09:21 UTC (rev 3091)
@@ -0,0 +1,29 @@
+# Makefile.in for BitBltPlugin on Unix
+#
+# Author: ian.piumarta at inria.fr
+#
+# Last edited: Dec 1 2009 by eliot miranda
+
+[make_cfg]
+[make_plg]
+
+TARGET= BitBltPlugin$a
+
+XINCLUDES= [includes]
+
+ifeq (,$(findstring ENABLE_FAST_BLT,$(CFLAGS)))
+ OBJS = BitBltPlugin$o BitBltArm$o BitBltArmLinux$o BitBltArmOther$o BitBltArmSimd$o BitBltDispatch$o BitBltGeneric$o
+else
+ ASMINCLUDES = -I$(topdir)/platforms/Cross/plugins/BitBltPlugin
+ ASMFLAGS = -cpu=6
+ AS = asasm $(ASMFLAGS) $(ASMINCLUDES) -o
+ OBJS = BitBltPlugin$o BitBltArm$o BitBltArmLinux$o BitBltArmSimdAlphaBlend$o BitBltArmSimdBitLogical$o BitBltArmSimdPixPaint$o BitBltArmSimdSourceWord$o BitBltArmSimd$o BitBltDispatch$o BitBltGeneric$o
+endif
+
+$(TARGET) : $(OBJS) Makefile
+ $(LINK) $(TARGET) $(OBJS)
+ $(RANLIB) $(TARGET)
+
+[make_targets]
+
+.force :
Modified: branches/Cog/platforms/unix/vm/sqUnixEvent.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixEvent.c 2014-10-03 00:08:10 UTC (rev 3090)
+++ branches/Cog/platforms/unix/vm/sqUnixEvent.c 2014-10-03 00:09:21 UTC (rev 3091)
@@ -148,7 +148,7 @@
}
}
#if DEBUG_MOUSE_EVENTS
- printf("BUTTONS");
+ printf("BUTTONS (getButtonState)");
printModifiers(modifiers);
printButtons(buttons);
printf("\n");
@@ -179,7 +179,7 @@
evt->windowIndex= 0;
signalInputEvent();
#if DEBUG_MOUSE_EVENTS
- printf("EVENT: mouse (%d,%d)", mousePosition.x, mousePosition.y);
+ printf("EVENT (recordMouseEvent): time: %d mouse (%d,%d)", evt->timeStamp, mousePosition.x, mousePosition.y);
printModifiers(state >> 3);
printButtons(state & 7);
printf("\n");
@@ -199,7 +199,7 @@
evt->windowIndex= 0;
signalInputEvent();
#if DEBUG_KEYBOARD_EVENTS
- printf("EVENT: key");
+ printf("EVENT (recordKeyboardEvent): time: %d key", evt->timeStamp);
switch (pressCode)
{
case EventKeyDown: printf(" down "); break;
@@ -226,7 +226,7 @@
evt->windowIndex= 0;
signalInputEvent();
#if DEBUG_EVENTS
- printf("EVENT: drag (%d,%d)", mousePosition.x, mousePosition.y);
+ printf("EVENT (recordDragEvent): drag (%d,%d)", mousePosition.x, mousePosition.y);
printModifiers(state >> 3);
printButtons(state & 7);
printf("\n");
@@ -245,7 +245,7 @@
evt->windowIndex= windowIndex;
signalInputEvent();
#if DEBUG_EVENTS
- printf("EVENT: window (%d %d %d %d %d %d) ", action, v1, v2, v3, v4, 0);
+ printf("EVENT (recordWindowEvent): window (%d %d %d %d %d %d) ", action, v1, v2, v3, v4, 0);
switch (action)
{
case WindowEventMetricChange: printf("metric change"); break;
@@ -267,8 +267,20 @@
if (iebEmptyP())
ioProcessEvents();
if (iebEmptyP())
- return false;
+ return false;
*evt= inputEventBuffer[iebOut];
+#if DEBUG_EVENTS
+ if (evt->type == EventTypeMouse) {
+ printf( "(ioGetNextEvent) MOUSE evt: time: %d x: %d y: %d ", evt->timeStamp, evt->unused1, evt->unused2);
+ printButtons( evt->unused3);
+ printf("\n");
+ }
+ if (evt->type == EventTypeKeyboard) {
+ printf( "(ioGetNextEvent) KEYBOARD evt: time: %d char: %d utf32: %d ", evt->timeStamp, evt->unused1, evt->unused4);
+ printf("\n");
+ }
+
+#endif
iebAdvance(iebOut);
return true;
}
Modified: branches/Cog/platforms/unix/vm/sqUnixVMProfile.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixVMProfile.c 2014-10-03 00:08:10 UTC (rev 3090)
+++ branches/Cog/platforms/unix/vm/sqUnixVMProfile.c 2014-10-03 00:09:21 UTC (rev 3091)
@@ -311,6 +311,8 @@
pctype pc = uap->uc_mcontext->ss.srr0;
#elif __linux__ && __i386__
pctype pc = uap->uc_mcontext.gregs[REG_EIP];
+#elif __linux__ && __arm__
+ pctype pc = uap->uc_mcontext.arm_pc;
#elif __FreeBSD__ && __i386__
pctype pc = uap->uc_mcontext.mc_eip;
#else
Modified: branches/Cog/platforms/unix/vm-display-X11/Makefile.in
===================================================================
--- branches/Cog/platforms/unix/vm-display-X11/Makefile.in 2014-10-03 00:08:10 UTC (rev 3090)
+++ branches/Cog/platforms/unix/vm-display-X11/Makefile.in 2014-10-03 00:09:21 UTC (rev 3091)
@@ -41,8 +41,8 @@
[make_plg]
TARGET = vm-display-X11$a
-OBJS = sqUnixX11$o sqUnixMozilla$o
+
XCFLAGS = $(X_CFLAGS)
XINCLUDES = [includes] $(X_INCLUDES) \
@@ -51,6 +51,16 @@
-I$(topdir)/platforms/unix/plugins/B3DAcceleratorPlugin \
-I/usr/X11R6/include
+ifeq (,$(findstring ENABLE_FAST_BLT,$(CFLAGS)))
+ OBJS = sqUnixX11$o sqUnixMozilla$o
+else
+ ASMINCLUDES = -I$(topdir)/platforms/Cross/plugins/BitBltPlugin
+ ASMFLAGS = -cpu=6
+ AS = asasm $(ASMFLAGS) $(ASMINCLUDES) -o
+ XCFLAGS = $(X_CFLAGS) -DUSE_FAST_BLT=1
+ OBJS = sqUnixX11$o sqUnixMozilla$o sqUnixX11Arm$o
+endif
+
$(TARGET) : $(OBJS) Makefile
$(LINK) $(TARGET) $(OBJS) $(X_LIBS)
$(RANLIB) $(TARGET)
Modified: branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c
===================================================================
--- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-10-03 00:08:10 UTC (rev 3090)
+++ branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-10-03 00:09:21 UTC (rev 3091)
@@ -3493,19 +3493,19 @@
switch (evt->type)
{
case ButtonPress:
- fprintf(stderr, "\nX ButtonPress state 0x%x button %d\n",
+ fprintf(stderr, "\n(handleEvent)X ButtonPress state 0x%x button %d\n",
evt->xbutton.state, evt->xbutton.button);
break;
case ButtonRelease:
- fprintf(stderr, "\nX ButtonRelease state 0x%x button %d\n",
+ fprintf(stderr, "\n(handleEvent)X ButtonRelease state 0x%x button %d\n",
evt->xbutton.state, evt->xbutton.button);
break;
case KeyPress:
- fprintf(stderr, "\nX KeyPress state 0x%x raw keycode %d\n",
+ fprintf(stderr, "\n(handleEvent)X KeyPress state 0x%x raw keycode %d\n",
evt->xkey.state, evt->xkey.keycode);
break;
case KeyRelease:
- fprintf(stderr, "\nX KeyRelease state 0x%x raw keycode %d\n",
+ fprintf(stderr, "\n(handleEvent)X KeyRelease state 0x%x raw keycode %d\n",
evt->xkey.state, evt->xkey.keycode);
break;
}
@@ -6531,7 +6531,7 @@
armSimdCopyImage32To32(fromImageData, toImageData, width, height, affectedL, affectedT, affectedR, affectedB);
else
# else
-# error unsupported use of ENABLE_FAST_BLT
+# error unsupported use of USE_FAST_BLT
# endif
#endif
{
More information about the Vm-dev
mailing list