Skip to content

Commit 71c4a2a

Browse files
elad335Nekotekina
elad335
authored and
Nekotekina
committed
Silence some log messages
1 parent 9690854 commit 71c4a2a

File tree

9 files changed

+54
-46
lines changed

9 files changed

+54
-46
lines changed

‎rpcs3/Emu/Cell/Modules/cellCamera.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ error_code cellCameraGetType(s32 dev_num, vm::ptr<s32> type)
587587

588588
s32 cellCameraIsAvailable(s32 dev_num)
589589
{
590-
cellCamera.todo("cellCameraIsAvailable(dev_num=%d)", dev_num);
590+
cellCamera.warning("cellCameraIsAvailable(dev_num=%d)", dev_num);
591591

592592
if (g_cfg.io.camera == camera_handler::null)
593593
{
@@ -611,7 +611,7 @@ s32 cellCameraIsAvailable(s32 dev_num)
611611

612612
s32 cellCameraIsAttached(s32 dev_num)
613613
{
614-
cellCamera.todo("cellCameraIsAttached(dev_num=%d)", dev_num);
614+
cellCamera.warning("cellCameraIsAttached(dev_num=%d)", dev_num);
615615

616616
if (g_cfg.io.camera == camera_handler::null)
617617
{
@@ -650,7 +650,7 @@ s32 cellCameraIsAttached(s32 dev_num)
650650

651651
s32 cellCameraIsOpen(s32 dev_num)
652652
{
653-
cellCamera.todo("cellCameraIsOpen(dev_num=%d)", dev_num);
653+
cellCamera.warning("cellCameraIsOpen(dev_num=%d)", dev_num);
654654

655655
if (g_cfg.io.camera == camera_handler::null)
656656
{
@@ -674,9 +674,9 @@ s32 cellCameraIsOpen(s32 dev_num)
674674
return g_camera->is_open;
675675
}
676676

677-
error_code cellCameraIsStarted(s32 dev_num)
677+
s32 cellCameraIsStarted(s32 dev_num)
678678
{
679-
cellCamera.todo("cellCameraIsStarted(dev_num=%d)", dev_num);
679+
cellCamera.warning("cellCameraIsStarted(dev_num=%d)", dev_num);
680680

681681
if (g_cfg.io.camera == camera_handler::null)
682682
{

‎rpcs3/Emu/Cell/Modules/cellGem.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ error_code cellGemGetImageState(u32 gem_num, vm::ptr<CellGemImageState> gem_imag
732732

733733
error_code cellGemGetInertialState(u32 gem_num, u32 state_flag, u64 timestamp, vm::ptr<CellGemInertialState> inertial_state)
734734
{
735-
cellGem.todo("cellGemGetInertialState(gem_num=%d, state_flag=%d, timestamp=0x%x, inertial_state=0x%x)", gem_num, state_flag, timestamp, inertial_state);
735+
cellGem.warning("cellGemGetInertialState(gem_num=%d, state_flag=%d, timestamp=0x%x, inertial_state=0x%x)", gem_num, state_flag, timestamp, inertial_state);
736736

737737
const auto gem = g_fxo->get<gem_config>();
738738

@@ -767,7 +767,7 @@ error_code cellGemGetInertialState(u32 gem_num, u32 state_flag, u64 timestamp, v
767767

768768
error_code cellGemGetInfo(vm::ptr<CellGemInfo> info)
769769
{
770-
cellGem.todo("cellGemGetInfo(info=*0x%x)", info);
770+
cellGem.warning("cellGemGetInfo(info=*0x%x)", info);
771771

772772
const auto gem = g_fxo->get<gem_config>();
773773

@@ -864,7 +864,7 @@ error_code cellGemGetRumble(u32 gem_num, vm::ptr<u8> rumble)
864864

865865
error_code cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr<CellGemState> gem_state)
866866
{
867-
cellGem.todo("cellGemGetState(gem_num=%d, flag=0x%x, time=0x%llx, gem_state=*0x%x)", gem_num, flag, time_parameter, gem_state);
867+
cellGem.warning("cellGemGetState(gem_num=%d, flag=0x%x, time=0x%llx, gem_state=*0x%x)", gem_num, flag, time_parameter, gem_state);
868868

869869
const auto gem = g_fxo->get<gem_config>();
870870

@@ -1247,7 +1247,7 @@ error_code cellGemTrackHues(vm::cptr<u32> req_hues, vm::ptr<u32> res_hues)
12471247

12481248
error_code cellGemUpdateFinish()
12491249
{
1250-
cellGem.todo("cellGemUpdateFinish()");
1250+
cellGem.warning("cellGemUpdateFinish()");
12511251

12521252
const auto gem = g_fxo->get<gem_config>();
12531253

@@ -1265,15 +1265,15 @@ error_code cellGemUpdateFinish()
12651265

12661266
if (!gem->camera_frame)
12671267
{
1268-
return CELL_GEM_NO_VIDEO;
1268+
return not_an_error(CELL_GEM_NO_VIDEO);
12691269
}
12701270

12711271
return CELL_OK;
12721272
}
12731273

12741274
error_code cellGemUpdateStart(vm::cptr<void> camera_frame, u64 timestamp)
12751275
{
1276-
cellGem.todo("cellGemUpdateStart(camera_frame=*0x%x, timestamp=%d)", camera_frame, timestamp);
1276+
cellGem.warning("cellGemUpdateStart(camera_frame=*0x%x, timestamp=%d)", camera_frame, timestamp);
12771277

12781278
const auto gem = g_fxo->get<gem_config>();
12791279

@@ -1293,7 +1293,7 @@ error_code cellGemUpdateStart(vm::cptr<void> camera_frame, u64 timestamp)
12931293
gem->camera_frame = camera_frame.addr();
12941294
if (!camera_frame)
12951295
{
1296-
return CELL_GEM_NO_VIDEO;
1296+
return not_an_error(CELL_GEM_NO_VIDEO);
12971297
}
12981298

12991299
return CELL_OK;

‎rpcs3/Emu/Cell/Modules/cellNetCtl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ error_code cellNetCtlNetStartDialogUnloadAsync(vm::ptr<CellNetCtlNetStartDialogR
300300

301301
error_code cellNetCtlGetNatInfo(vm::ptr<CellNetCtlNatInfo> natInfo)
302302
{
303-
cellNetCtl.todo("cellNetCtlGetNatInfo(natInfo=*0x%x)", natInfo);
303+
cellNetCtl.warning("cellNetCtlGetNatInfo(natInfo=*0x%x)", natInfo);
304304

305305
if (!g_fxo->get<cell_net_ctl_manager>()->is_initialized)
306306
{

‎rpcs3/Emu/Cell/Modules/sceNp.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ error_code sceNpBasicSendMessageGui(vm::cptr<SceNpBasicMessageDetails> msg, sys_
750750

751751
if (g_psn_connection_status != SCE_NP_MANAGER_STATUS_ONLINE)
752752
{
753-
return SCE_NP_BASIC_ERROR_NOT_CONNECTED;
753+
return not_an_error(SCE_NP_BASIC_ERROR_NOT_CONNECTED);
754754
}
755755

756756
return CELL_OK;
@@ -777,7 +777,7 @@ error_code sceNpBasicSendMessageAttachment(vm::cptr<SceNpId> to, vm::cptr<char>
777777

778778
if (g_psn_connection_status != SCE_NP_MANAGER_STATUS_ONLINE)
779779
{
780-
return SCE_NP_BASIC_ERROR_NOT_CONNECTED;
780+
return not_an_error(SCE_NP_BASIC_ERROR_NOT_CONNECTED);
781781
}
782782

783783
return CELL_OK;
@@ -884,7 +884,7 @@ error_code sceNpBasicAddFriend(vm::cptr<SceNpId> contact, vm::cptr<char> body, s
884884

885885
if (g_psn_connection_status != SCE_NP_MANAGER_STATUS_ONLINE)
886886
{
887-
return SCE_NP_BASIC_ERROR_NOT_CONNECTED;
887+
return not_an_error(SCE_NP_BASIC_ERROR_NOT_CONNECTED);
888888
}
889889

890890
return CELL_OK;
@@ -1102,7 +1102,7 @@ error_code sceNpBasicGetPlayersHistoryEntryCount(u32 options, vm::ptr<u32> count
11021102

11031103
error_code sceNpBasicGetPlayersHistoryEntry(u32 options, u32 index, vm::ptr<SceNpId> npid)
11041104
{
1105-
sceNp.todo("sceNpBasicGetPlayersHistoryEntry(options=%d, index=%d, npid=*0x%x)", options, index, npid);
1105+
sceNp.warning("sceNpBasicGetPlayersHistoryEntry(options=%d, index=%d, npid=*0x%x)", options, index, npid);
11061106

11071107
if (!g_fxo->get<sce_np_manager>()->is_initialized)
11081108
{
@@ -1126,7 +1126,7 @@ error_code sceNpBasicGetPlayersHistoryEntry(u32 options, u32 index, vm::ptr<SceN
11261126

11271127
error_code sceNpBasicAddBlockListEntry(vm::cptr<SceNpId> npid)
11281128
{
1129-
sceNp.todo("sceNpBasicAddBlockListEntry(npid=*0x%x)", npid);
1129+
sceNp.warning("sceNpBasicAddBlockListEntry(npid=*0x%x)", npid);
11301130

11311131
if (!g_fxo->get<sce_np_manager>()->is_initialized)
11321132
{
@@ -1140,15 +1140,15 @@ error_code sceNpBasicAddBlockListEntry(vm::cptr<SceNpId> npid)
11401140

11411141
if (g_psn_connection_status != SCE_NP_MANAGER_STATUS_ONLINE)
11421142
{
1143-
return SCE_NP_BASIC_ERROR_NOT_CONNECTED;
1143+
return not_an_error(SCE_NP_BASIC_ERROR_NOT_CONNECTED);
11441144
}
11451145

11461146
return CELL_OK;
11471147
}
11481148

11491149
error_code sceNpBasicGetBlockListEntryCount(vm::ptr<u32> count)
11501150
{
1151-
sceNp.todo("sceNpBasicGetBlockListEntryCount(count=*0x%x)", count);
1151+
sceNp.warning("sceNpBasicGetBlockListEntryCount(count=*0x%x)", count);
11521152

11531153
if (!g_fxo->get<sce_np_manager>()->is_initialized)
11541154
{
@@ -1438,7 +1438,7 @@ error_code sceNpBasicGetMessageEntry(u32 type, u32 index, vm::ptr<SceNpUserInfo>
14381438

14391439
error_code sceNpBasicGetEvent(vm::ptr<s32> event, vm::ptr<SceNpUserInfo> from, vm::ptr<s32> data, vm::ptr<u32> size)
14401440
{
1441-
sceNp.todo("sceNpBasicGetEvent(event=*0x%x, from=*0x%x, data=*0x%x, size=*0x%x)", event, from, data, size);
1441+
sceNp.warning("sceNpBasicGetEvent(event=*0x%x, from=*0x%x, data=*0x%x, size=*0x%x)", event, from, data, size);
14421442

14431443
if (!g_fxo->get<sce_np_manager>()->is_initialized)
14441444
{
@@ -1453,7 +1453,7 @@ error_code sceNpBasicGetEvent(vm::ptr<s32> event, vm::ptr<SceNpUserInfo> from, v
14531453
// TODO: Check for other error and pass other events
14541454
//*event = SCE_NP_BASIC_EVENT_OFFLINE; // This event only indicates a contact is offline, not the current status of the connection
14551455

1456-
return SCE_NP_BASIC_ERROR_NO_EVENT;
1456+
return not_an_error(SCE_NP_BASIC_ERROR_NO_EVENT);
14571457
}
14581458

14591459
error_code sceNpCommerceCreateCtx(u32 version, vm::ptr<SceNpId> npId, vm::ptr<SceNpCommerceHandler> handler, vm::ptr<void> arg, vm::ptr<u32> ctx_id)
@@ -1729,7 +1729,7 @@ error_code sceNpCustomMenuRegisterExceptionList(vm::cptr<SceNpCustomMenuActionEx
17291729

17301730
error_code sceNpFriendlist(vm::ptr<SceNpFriendlistResultHandler> resultHandler, vm::ptr<void> userArg, sys_memory_container_t containerId)
17311731
{
1732-
sceNp.todo("sceNpFriendlist(resultHandler=*0x%x, userArg=*0x%x, containerId=%d)", resultHandler, userArg, containerId);
1732+
sceNp.warning("sceNpFriendlist(resultHandler=*0x%x, userArg=*0x%x, containerId=%d)", resultHandler, userArg, containerId);
17331733

17341734
if (!g_fxo->get<sce_np_manager>()->is_initialized)
17351735
{
@@ -1746,7 +1746,7 @@ error_code sceNpFriendlist(vm::ptr<SceNpFriendlistResultHandler> resultHandler,
17461746

17471747
error_code sceNpFriendlistCustom(SceNpFriendlistCustomOptions options, vm::ptr<SceNpFriendlistResultHandler> resultHandler, vm::ptr<void> userArg, sys_memory_container_t containerId)
17481748
{
1749-
sceNp.todo("sceNpFriendlistCustom(options=0x%x, resultHandler=*0x%x, userArg=*0x%x, containerId=%d)", options, resultHandler, userArg, containerId);
1749+
sceNp.warning("sceNpFriendlistCustom(options=0x%x, resultHandler=*0x%x, userArg=*0x%x, containerId=%d)", options, resultHandler, userArg, containerId);
17501750

17511751
if (!g_fxo->get<sce_np_manager>()->is_initialized)
17521752
{
@@ -2272,7 +2272,7 @@ error_code sceNpManagerUnregisterCallback()
22722272

22732273
error_code sceNpManagerGetStatus(vm::ptr<s32> status)
22742274
{
2275-
sceNp.todo("sceNpManagerGetStatus(status=*0x%x)", status);
2275+
sceNp.warning("sceNpManagerGetStatus(status=*0x%x)", status);
22762276

22772277
if (!g_fxo->get<sce_np_manager>()->is_initialized)
22782278
{
@@ -2376,7 +2376,7 @@ error_code sceNpManagerGetNpId(ppu_thread& ppu, vm::ptr<SceNpId> npId)
23762376

23772377
error_code sceNpManagerGetOnlineName(vm::ptr<SceNpOnlineName> onlineName)
23782378
{
2379-
sceNp.todo("sceNpManagerGetOnlineName(onlineName=*0x%x)", onlineName);
2379+
sceNp.warning("sceNpManagerGetOnlineName(onlineName=*0x%x)", onlineName);
23802380

23812381
if (!g_fxo->get<sce_np_manager>()->is_initialized)
23822382
{
@@ -2403,7 +2403,7 @@ error_code sceNpManagerGetOnlineName(vm::ptr<SceNpOnlineName> onlineName)
24032403

24042404
error_code sceNpManagerGetAvatarUrl(vm::ptr<SceNpAvatarUrl> avatarUrl)
24052405
{
2406-
sceNp.todo("sceNpManagerGetAvatarUrl(avatarUrl=*0x%x)", avatarUrl);
2406+
sceNp.warning("sceNpManagerGetAvatarUrl(avatarUrl=*0x%x)", avatarUrl);
24072407

24082408
if (!g_fxo->get<sce_np_manager>()->is_initialized)
24092409
{
@@ -2430,7 +2430,7 @@ error_code sceNpManagerGetAvatarUrl(vm::ptr<SceNpAvatarUrl> avatarUrl)
24302430

24312431
error_code sceNpManagerGetMyLanguages(vm::ptr<SceNpMyLanguages> myLanguages)
24322432
{
2433-
sceNp.todo("sceNpManagerGetMyLanguages(myLanguages=*0x%x)", myLanguages);
2433+
sceNp.warning("sceNpManagerGetMyLanguages(myLanguages=*0x%x)", myLanguages);
24342434

24352435
if (!g_fxo->get<sce_np_manager>()->is_initialized)
24362436
{
@@ -2457,7 +2457,7 @@ error_code sceNpManagerGetMyLanguages(vm::ptr<SceNpMyLanguages> myLanguages)
24572457

24582458
error_code sceNpManagerGetAccountRegion(vm::ptr<SceNpCountryCode> countryCode, vm::ptr<s32> language)
24592459
{
2460-
sceNp.todo("sceNpManagerGetAccountRegion(countryCode=*0x%x, language=*0x%x)", countryCode, language);
2460+
sceNp.warning("sceNpManagerGetAccountRegion(countryCode=*0x%x, language=*0x%x)", countryCode, language);
24612461

24622462
if (!g_fxo->get<sce_np_manager>()->is_initialized)
24632463
{
@@ -2484,7 +2484,7 @@ error_code sceNpManagerGetAccountRegion(vm::ptr<SceNpCountryCode> countryCode, v
24842484

24852485
error_code sceNpManagerGetAccountAge(vm::ptr<s32> age)
24862486
{
2487-
sceNp.todo("sceNpManagerGetAccountAge(age=*0x%x)", age);
2487+
sceNp.warning("sceNpManagerGetAccountAge(age=*0x%x)", age);
24882488

24892489
if (!g_fxo->get<sce_np_manager>()->is_initialized)
24902490
{
@@ -2511,7 +2511,7 @@ error_code sceNpManagerGetAccountAge(vm::ptr<s32> age)
25112511

25122512
error_code sceNpManagerGetContentRatingFlag(vm::ptr<s32> isRestricted, vm::ptr<s32> age)
25132513
{
2514-
sceNp.todo("sceNpManagerGetContentRatingFlag(isRestricted=*0x%x, age=*0x%x)", isRestricted, age);
2514+
sceNp.warning("sceNpManagerGetContentRatingFlag(isRestricted=*0x%x, age=*0x%x)", isRestricted, age);
25152515

25162516
if (!g_fxo->get<sce_np_manager>()->is_initialized)
25172517
{
@@ -2542,7 +2542,7 @@ error_code sceNpManagerGetContentRatingFlag(vm::ptr<s32> isRestricted, vm::ptr<s
25422542

25432543
error_code sceNpManagerGetChatRestrictionFlag(vm::ptr<s32> isRestricted)
25442544
{
2545-
sceNp.todo("sceNpManagerGetChatRestrictionFlag(isRestricted=*0x%x)", isRestricted);
2545+
sceNp.warning("sceNpManagerGetChatRestrictionFlag(isRestricted=*0x%x)", isRestricted);
25462546

25472547
if (!g_fxo->get<sce_np_manager>()->is_initialized)
25482548
{
@@ -4285,7 +4285,7 @@ error_code sceNpUtilCmpNpId(vm::ptr<SceNpId> id1, vm::ptr<SceNpId> id2)
42854285

42864286
error_code sceNpUtilCmpNpIdInOrder(vm::cptr<SceNpId> id1, vm::cptr<SceNpId> id2, vm::ptr<s32> order)
42874287
{
4288-
sceNp.todo("sceNpUtilCmpNpIdInOrder(id1=*0x%x, id2=*0x%x, order=*0x%x)", id1, id2, order);
4288+
sceNp.warning("sceNpUtilCmpNpIdInOrder(id1=*0x%x, id2=*0x%x, order=*0x%x)", id1, id2, order);
42894289

42904290
if (!id1 || !id2)
42914291
{
@@ -4332,7 +4332,7 @@ error_code sceNpUtilCmpNpIdInOrder(vm::cptr<SceNpId> id1, vm::cptr<SceNpId> id2,
43324332

43334333
error_code sceNpUtilCmpOnlineId(vm::cptr<SceNpId> id1, vm::cptr<SceNpId> id2)
43344334
{
4335-
sceNp.todo("sceNpUtilCmpOnlineId(id1=*0x%x, id2=*0x%x)", id1, id2);
4335+
sceNp.warning("sceNpUtilCmpOnlineId(id1=*0x%x, id2=*0x%x)", id1, id2);
43364336

43374337
if (!id1 || !id2)
43384338
{
@@ -4354,7 +4354,7 @@ error_code sceNpUtilCmpOnlineId(vm::cptr<SceNpId> id1, vm::cptr<SceNpId> id2)
43544354

43554355
error_code sceNpUtilGetPlatformType(vm::cptr<SceNpId> npId)
43564356
{
4357-
sceNp.todo("sceNpUtilGetPlatformType(npId=*0x%x)", npId);
4357+
sceNp.warning("sceNpUtilGetPlatformType(npId=*0x%x)", npId);
43584358

43594359
if (!npId)
43604360
{
@@ -4380,7 +4380,7 @@ error_code sceNpUtilGetPlatformType(vm::cptr<SceNpId> npId)
43804380

43814381
error_code sceNpUtilSetPlatformType(vm::ptr<SceNpId> npId, SceNpPlatformType platformType)
43824382
{
4383-
sceNp.todo("sceNpUtilSetPlatformType(npId=*0x%x, platformType=%d)", npId, platformType);
4383+
sceNp.warning("sceNpUtilSetPlatformType(npId=*0x%x, platformType=%d)", npId, platformType);
43844384

43854385
if (!npId)
43864386
{

‎rpcs3/Emu/Cell/Modules/sceNpSns.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ error_code sceNpSnsFbGetAccessToken(u32 handle, vm::cptr<SceNpSnsFbAccessTokenPa
184184

185185
if (g_psn_connection_status == SCE_NP_MANAGER_STATUS_OFFLINE)
186186
{
187-
return SCE_NP_SNS_ERROR_NOT_SIGN_IN;
187+
return not_an_error(SCE_NP_SNS_ERROR_NOT_SIGN_IN);
188188
}
189189

190190
// TODO
@@ -309,7 +309,7 @@ error_code sceNpSnsFbGetLongAccessToken(u32 handle, vm::cptr<SceNpSnsFbAccessTok
309309

310310
if (g_psn_connection_status == SCE_NP_MANAGER_STATUS_OFFLINE)
311311
{
312-
return SCE_NP_SNS_ERROR_NOT_SIGN_IN;
312+
return not_an_error(SCE_NP_SNS_ERROR_NOT_SIGN_IN);
313313
}
314314

315315
return CELL_OK;

‎rpcs3/Emu/Cell/lv2/sys_mmapper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ error_code sys_mmapper_allocate_shared_memory_from_container(ppu_thread& ppu, u6
130130
{
131131
vm::temporary_unlock(ppu);
132132

133-
sys_mmapper.error("sys_mmapper_allocate_shared_memory_from_container(0x%llx, size=0x%x, cid=0x%x, flags=0x%llx, mem_id=*0x%x)", unk, size, cid, flags, mem_id);
133+
sys_mmapper.warning("sys_mmapper_allocate_shared_memory_from_container(0x%llx, size=0x%x, cid=0x%x, flags=0x%llx, mem_id=*0x%x)", unk, size, cid, flags, mem_id);
134134

135135
// Check page granularity.
136136
switch (flags & SYS_MEMORY_PAGE_SIZE_MASK)

‎rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ error_code sys_ppu_thread_join(ppu_thread& ppu, u32 thread_id, vm::ptr<u64> vptr
134134

135135
if (!vptr)
136136
{
137-
return CELL_EFAULT;
137+
return not_an_error(CELL_EFAULT);
138138
}
139139

140140
// Get the exit status from the register

‎rpcs3/Emu/Cell/lv2/sys_spu.cpp‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ error_code sys_spu_thread_initialize(ppu_thread& ppu, vm::ptr<u32> thread, u32 g
311311

312312
if (u32 option = attr->option)
313313
{
314-
sys_spu.todo("Unimplemented SPU Thread options (0x%x)", option);
314+
sys_spu.warning("Unimplemented SPU Thread options (0x%x)", option);
315315
}
316316

317317
const vm::addr_t ls_addr{verify("SPU LS" HERE, vm::alloc(0x80000, vm::main))};
@@ -418,7 +418,7 @@ error_code sys_spu_thread_group_create(ppu_thread& ppu, vm::ptr<u32> id, u32 num
418418

419419
if (attr->type)
420420
{
421-
sys_spu.todo("Unsupported SPU Thread Group type (0x%x)", attr->type);
421+
sys_spu.warning("sys_spu_thread_group_create(): SPU Thread Group type (0x%x)", attr->type);
422422
}
423423

424424
*id = idm::make<lv2_spu_group>(std::string(attr->name.get_ptr(), std::max<u32>(attr->nsize, 1) - 1), num, prio, attr->type, attr->ct);
@@ -784,14 +784,20 @@ error_code sys_spu_thread_group_join(ppu_thread& ppu, u32 id, vm::ptr<u32> cause
784784

785785
if (!cause)
786786
{
787-
return CELL_EFAULT;
787+
if (status)
788+
{
789+
// Report unwritten data
790+
return CELL_EFAULT;
791+
}
792+
793+
return not_an_error(CELL_EFAULT);
788794
}
789795

790796
*cause = static_cast<u32>(ppu.gpr[4]);
791797

792798
if (!status)
793799
{
794-
return CELL_EFAULT;
800+
return not_an_error(CELL_EFAULT);
795801
}
796802

797803
*status = static_cast<s32>(ppu.gpr[5]);

0 commit comments

Comments
 (0)