Macintosh-Tools
/
shoebill
mirror of https://github.com/pruten/shoebill.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Closing out some final simple changes

This commit is contained in:
Peter Rutenbar 2015-09-13 19:11:18 -07:00
parent 0322e558b4
commit d26cbef0c1
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/ethernet.c
View File

@ -503,8 +503,6 @@ void nubus_ethernet_destroy_func(uint8_t slotnum)
pthread_mutex_destroy(&ctx->lock); pthread_mutex_destroy(&ctx->lock);
pthread_mutex_destroy(&ctx->sender_cond_mutex); pthread_mutex_destroy(&ctx->sender_cond_mutex);
pthread_cond_destroy(&ctx->sender_cond); pthread_cond_destroy(&ctx->sender_cond);
close(ctx->tap_fd);
} }
uint32_t nubus_ethernet_read_func(const uint32_t rawaddr, uint32_t nubus_ethernet_read_func(const uint32_t rawaddr,
@ -530,7 +528,7 @@ uint32_t nubus_ethernet_read_func(const uint32_t rawaddr,
else else
assert(!"read: bogus size"); assert(!"read: bogus size");
slog("ethernet: reading from ram addr 0x%x sz=%u ", addr, size); // slog("ethernet: reading from ram addr 0x%x sz=%u ", addr, size);
goto done; goto done;
} }
@ -696,7 +694,7 @@ void nubus_ethernet_write_func(const uint32_t rawaddr,
else else
assert(!"write: bogus size"); assert(!"write: bogus size");
slog("ethernet: writing 0x%x sz=%u to ram addr 0x%x\n", data, size, addr); // slog("ethernet: writing 0x%x sz=%u to ram addr 0x%x\n", data, size, addr);
goto done; goto done;
} }

14
core/fpu.c
View File

@ -502,12 +502,12 @@ static void _fpu_write_ea(uint8_t mr, uint8_t format, floatx80 *f, uint8_t K)
/* Copy the formatted data into *addr */ /* Copy the formatted data into *addr */
{ /*{
slog("FPU: fpu_write_ea: addr=0x%08x data=", addr); slog("FPU: fpu_write_ea: addr=0x%08x data=", addr);
for (i=0; i<size; i++) for (i=0; i<size; i++)
printf("%02x", ptr[i]); printf("%02x", ptr[i]);
printf("\n"); printf("\n");
} }*/
for (i=0; i<size; i++) { for (i=0; i<size; i++) {
lset(addr + i, 1, buf[i]); lset(addr + i, 1, buf[i]);
@ -687,12 +687,12 @@ got_address:
* Step 2: Load the data from the effective address * Step 2: Load the data from the effective address
*/ */
slog("raw=0x"); //slog("raw=0x");
if (size <= 4) { if (size <= 4) {
const uint32_t raw = lget(addr, size); const uint32_t raw = lget(addr, size);
if (shoe.abort) if (shoe.abort)
return 0; return 0;
printf("%x ", raw); //printf("%x ", raw);
switch (format) { switch (format) {
case format_B: case format_B:
*result = _int8_to_intermediate(raw & 0xff); *result = _int8_to_intermediate(raw & 0xff);
@ -740,7 +740,7 @@ got_address:
} }
got_data: got_data:
printf("\n"); //printf("\n");
return 1; return 1;
} }
@ -2631,10 +2631,10 @@ static void inst_fmath (const uint16_t ext)
} }
{ /*{
long double tmp = _float128_to_long_double(fpu->source); long double tmp = _float128_to_long_double(fpu->source);
printf("%Lf,fp%u\n", tmp, dest_register); printf("%Lf,fp%u\n", tmp, dest_register);
} }*/
/* fsincos needs this to know which register to write cos */ /* fsincos needs this to know which register to write cos */
fpu->extension_word = ext; fpu->extension_word = ext;

2
gui/Shoebill/shoeAppDelegate.m
View File

@ -80,7 +80,7 @@
for (i=0; i<4; i++) { for (i=0; i<4; i++) {
[defaults setInteger:640 forKey:[NSString stringWithFormat:@"screenWidth%u", i]]; [defaults setInteger:640 forKey:[NSString stringWithFormat:@"screenWidth%u", i]];
[defaults setInteger:480 forKey:[NSString stringWithFormat:@"screenHeight%u", i]]; [defaults setInteger:480 forKey:[NSString stringWithFormat:@"screenHeight%u", i]];
[defaults setInteger:1 forKey:[NSString stringWithFormat:@"screenEnabled%u", i]]; [defaults setInteger:0 forKey:[NSString stringWithFormat:@"screenEnabled%u", i]];
} }
[defaults setInteger:1 forKey:@"screenEnabled0"]; [defaults setInteger:1 forKey:@"screenEnabled0"];
} }

2
gui/Shoebill/shoeScreenView.m
View File

@ -82,7 +82,7 @@
[[NSRunLoop currentRunLoop] addTimer:timer [[NSRunLoop currentRunLoop] addTimer:timer
forMode:NSEventTrackingRunLoopMode]; forMode:NSEventTrackingRunLoopMode];
[[self window] setTitle:[NSString stringWithFormat:@"Shoebill - Screen 1"]]; [[self window] setTitle:[NSString stringWithFormat:@"Shoebill"]];
[[self window] makeKeyAndOrderFront:nil]; [[self window] makeKeyAndOrderFront:nil];
} }

4
gui/Shoebill/shoeScreenWindow.m
View File

@ -104,7 +104,7 @@
shoeApplication *shoeApp = (shoeApplication*)NSApp; shoeApplication *shoeApp = (shoeApplication*)NSApp;
shoeApp->doCaptureMouse = NO; shoeApp->doCaptureMouse = NO;
CGDisplayShowCursor(0); CGDisplayShowCursor(0);
[self setTitle:@"Shoebill - Screen 1"]; [self setTitle:@"Shoebill"];
} }
- (void) captureMouse - (void) captureMouse
@ -113,7 +113,7 @@
shoeApp->doCaptureMouse = YES; shoeApp->doCaptureMouse = YES;
CGDisplayHideCursor(0); CGDisplayHideCursor(0);
[self warpToCenter]; [self warpToCenter];
[self setTitle:@"Shoebill - Screen 1 (Ctrl-click to escape)"]; [self setTitle:@"Shoebill (Ctrl-click to escape)"];
} }

2
sdl-gui/osx_build.sh
View File

@ -17,6 +17,6 @@ $CC -O1 ../core/decoder_gen.c -o decoder_gen
./decoder_gen dis . ./decoder_gen dis .
cmd="$CC -O3 -ggdb -flto $files sdl.c -framework OpenGL -framework SDL2 -o shoebill" cmd="$CC -F/Library/Frameworks -O3 -ggdb -flto $files sdl.c -framework OpenGL -framework SDL2 -o shoebill"
echo $cmd echo $cmd
$cmd $cmd